|
Size: 831
Comment:
|
Size: 1772
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 3: | Line 3: |
| '''This extension is not distributed with Mercurial.''' | '''This extension is distributed with Mercurial.''' |
| Line 6: | Line 6: |
Download site: http://hg.kublai.com/mercurial/extensions/imerge |
|
| Line 13: | Line 11: |
| 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 and you may commit it. You can save the work you've done on the merge with {{{hg imerge save}}} ''file'', which stores the revisions you are merging, the list of files with conflicts, and copies of the files you've resolved so far into ''file''. You can later resume the merge from this point with {{{hg imerge load}}} ''file''. 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 a merge is in progress, {{{hg imerge}}} will default to merging the next unresolved file. |
|
| Line 15: | Line 29: |
| * imerge status: show the current state of the merge * imerge next: show the next unresolved file merge * imerge merge <file>: merge <file> * imerge resolve <file>...: mark files as successfully merged * imerge unresolve <file>...: mark files as requiring merging. |
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 |
Imerge Extension
This extension is distributed with Mercurial.
Author: Brendan Cully
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 and you may commit it.
You can save the work you've done on the merge with hg imerge save file, which stores the revisions you are merging, the list of files with conflicts, and copies of the files you've resolved so far into file. You can later resume the merge from this point with hg imerge load file.
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 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