|
Size: 1427
Comment:
|
← Revision 21 as of 2011-03-28 21:47:31 ⇥
Size: 1886
Comment: change link
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 5: | Line 5: |
| Email: [[MailTo(bboissin AT SPAMFREE gmail DOT com)]] | Email: <<MailTo(bboissin AT SPAMFREE gmail DOT com)>> |
| Line 7: | Line 7: |
| Mercurial repository at : http://hg.intevation.org/mercurial/tonfa | Personal website: http://bboissin.appspot.com Mercurial repository at: http://hg.intevation.org/mercurial/tonfa and http://bitbucket.org/bboissin/ |
| Line 17: | Line 19: |
| = Release notes = Available at: |
= API some people care about = |
| Line 20: | Line 21: |
| http://selenic.com/mercurial/release More information at: http://selenic.com/mercurial Major changes between Mercurial 0.9.1 and 0.??: New features: * merge now follows renames and copies * log follows copies ? * new web interface with simpler url's * bundle can now use -r and --base removing the need of an base repository * The diff outputted can now be in git-style patch, with handling of renames and chmod. import and mq can now use git style patches too New contributions and extensions: New hooks added: Behaviour changes: Memory usage and performance improvements: Other changes of note: |
* HG_MERGE_NEEDED_ERR = "(run 'hg heads' to see heads, 'hg merge' to merge)"; * HG_MERGE_CONFLICT_ERR = "conflicts detected in "; * HG_MERGE_MULTIPLE_HEADS_ERR = "abort: repo has "; * HG_MERGE_UNCOMMITTED_ERR = "abort: outstanding uncommitted merges"; * HG_CREATE_NEW_BRANCH_ERR = "abort: push creates new remote branches!"; * HG_HEADS_CREATED_ERR = "(+1 heads)"; * HG_NO_REPOSITORY_ERR = "abort: There is no Mercurial repository here"; * HG_UPDATE_SPAN_BRANCHES_ERR = "abort: update spans branches"; * HG_ALREADY_TRACKED_ERR = " already tracked!"; * HG_NOT_TRACKED_ERR = " no tracked!"; * HG_NOT_FOUND_ERR = "not found!"; * HG_CANNOT_READ_COMMIT_MESSAGE_ERR = "abort: can't read commit message"; * HG_UNABLE_EXECUTE_COMMAND_ERR = "unable to execute hg command"; * HG_UNABLE_CLONE_ERR = "abort: destination "; * HG_NODE_NAME_ERR = "abort: node name or service name not known"; * HG_NO_CHANGE_NEEDED_ERR = "no change needed"; * HG_NO_ROLLBACK_ERR = "no rollback information available"; |
Benoit Boissinot
Email: <bboissin AT SPAMFREE gmail DOT com>
Personal website: http://bboissin.appspot.com
Mercurial repository at: http://hg.intevation.org/mercurial/tonfa and http://bitbucket.org/bboissin/
notes to self:
- want to add the parent in dirstate (so that localrepo.changes doesn't report modified after a merge)
- want to add the base in changegroup (so that full revision can be inserted)
IDEAS
- Get rid of metadatas in manifest, put them in the filelog (like copies). It makes sense because each change to a file should be reflected at the filelog level.
- add a delete entry in the filelog and add it to the manifest (that way we know when the head is removed, and 'hg log filename' will show the deletion)
API some people care about
- HG_MERGE_NEEDED_ERR = "(run 'hg heads' to see heads, 'hg merge' to merge)";
- HG_MERGE_CONFLICT_ERR = "conflicts detected in ";
- HG_MERGE_MULTIPLE_HEADS_ERR = "abort: repo has ";
- HG_MERGE_UNCOMMITTED_ERR = "abort: outstanding uncommitted merges";
- HG_CREATE_NEW_BRANCH_ERR = "abort: push creates new remote branches!";
- HG_HEADS_CREATED_ERR = "(+1 heads)";
- HG_NO_REPOSITORY_ERR = "abort: There is no Mercurial repository here";
- HG_UPDATE_SPAN_BRANCHES_ERR = "abort: update spans branches";
- HG_ALREADY_TRACKED_ERR = " already tracked!";
- HG_NOT_TRACKED_ERR = " no tracked!";
- HG_NOT_FOUND_ERR = "not found!";
- HG_CANNOT_READ_COMMIT_MESSAGE_ERR = "abort: can't read commit message";
- HG_UNABLE_EXECUTE_COMMAND_ERR = "unable to execute hg command";
- HG_UNABLE_CLONE_ERR = "abort: destination ";
- HG_NODE_NAME_ERR = "abort: node name or service name not known";
- HG_NO_CHANGE_NEEDED_ERR = "no change needed";
- HG_NO_ROLLBACK_ERR = "no rollback information available";