Diff for "ImergeExtension"

Differences between revisions 3 and 4

Imerge Extension

This extension is not distributed with Mercurial.

Author: Brendan Cully

Download site: http://hg.kublai.com/mercurial/extensions/imerge

Overview

imerge lets you split a merge into pieces. When you start a merge with imerge, the names of all files with conflicts are recorded. You can then merge any of these files, and if the merge is successful, they will be marked as resolved. When all files are resolved, the merge is complete.

If no merge is in progress, hg imerge [rev] will merge the working directory with rev (defaulting to the other head if the repository only has two heads). You may also resume a saved merge with hg imerge load <file>.

If a merge is in progress, hg imerge will default to merging the next unresolved file.

The following subcommands are available:

status: show the current state of the merge
next: show the next unresolved file merge
merge [<file>]: merge <file>. If the file merge is successful, the file will be recorded as resolved. If no file is given, the next unresolved file will be merged.
resolve <file>...: mark files as successfully merged
unresolve <file>...: mark files as requiring merging
save <file>: save the state of the merge to a file to be resumed elsewhere
load <file>: load the state of the merge from a file created by save

Configuration

Configure your .hgrc to enable the extension by adding following lines:

[extensions]
imerge=/path/to/imerge.py

CategoryExtension

-  ⇤ ← Revision 3 as of 2007-06-29 04:52:47 → 
  Size: 1339
  Editor: BrendanCully
  Comment: updated help text
+   ← Revision 4 as of 2007-06-29 17:57:00 → ⇥
  Size: 1578
  Editor: BrendanCully
  Comment: Add save, load
-Deletions are marked like this.
+Additions are marked like this.
 Line 17:
-If no merge is in progress, hg imerge [rev] will merge the working
directory with rev (defaulting to the other head if the repository
only has two heads).
+If no merge is in progress, {{{hg imerge}}} [''rev''] will merge the working
directory with ''rev'' (defaulting to the other head if the repository
only has two heads). You may also resume a saved merge with
{{{hg imerge load <file>}}}.
-Line 21:
+Line 22:
-If a merge is in progress, hg imerge will default to merging the
+If a merge is in progress, {{{hg imerge}}} will default to merging the
-Line 31:
+Line 32:
+ save <file>:: save the state of the merge to a file to be resumed elsewhere
 load <file>:: load the state of the merge from a file created by save