mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
9d996cd13f
Add [merge-tool] hgrc section with:
<tool>.executable = name or path (<tool>)
<tool>.args = args with $local/base/other/output ($local $base $other)
<tool>.priority = priority (default 0)
<tool>.binary = handles binary (False)
<tool>.symlink = handles symlinks (False)
<tool>.checkconflict = check for conflict markers (False)
<tool>.premerge = try internal simplemerge (True if not binary or symlink)
Four built-in tools: internal:{merge,local,other,fail}
Add [merge-patterns] section of the form:
<pattern> = <tool>
Priority of settings is:
HGMERGE
merge-patterns
ui:merge
merge-tools by priority
hgmerge, if it can be found
Changes:
unsuccessful merges leave .orig files
70 lines
1.7 KiB
Plaintext
70 lines
1.7 KiB
Plaintext
# revision 0
|
|
adding copy
|
|
adding move
|
|
adding remove
|
|
adding unchanged
|
|
adding zzz1_merge_ok
|
|
adding zzz2_merge_bad
|
|
# revision 1
|
|
# local changes to revision 0
|
|
4 files updated, 0 files merged, 3 files removed, 0 files unresolved
|
|
--- a/zzz1_merge_ok
|
|
+++ b/zzz1_merge_ok
|
|
+new last line
|
|
--- a/zzz2_merge_bad
|
|
+++ b/zzz2_merge_bad
|
|
+another last line
|
|
M zzz1_merge_ok
|
|
M zzz2_merge_bad
|
|
# local merge with bad merge tool
|
|
merging zzz1_merge_ok
|
|
merging zzz2_merge_bad
|
|
merging zzz2_merge_bad failed!
|
|
3 files updated, 1 files merged, 2 files removed, 1 files unresolved
|
|
There are unresolved merges with locally modified files.
|
|
You can finish the partial merge using:
|
|
hg update 0
|
|
hg update 1
|
|
2 files updated, 0 files merged, 3 files removed, 0 files unresolved
|
|
--- a/zzz1_merge_ok
|
|
+++ b/zzz1_merge_ok
|
|
+new first line
|
|
+new last line
|
|
--- a/zzz2_merge_bad
|
|
+++ b/zzz2_merge_bad
|
|
+another last line
|
|
M zzz1_merge_ok
|
|
M zzz2_merge_bad
|
|
? zzz2_merge_bad.orig
|
|
# local merge with conflicts
|
|
merging zzz1_merge_ok
|
|
merging zzz2_merge_bad
|
|
warning: conflicts during merge.
|
|
merging zzz2_merge_bad failed!
|
|
3 files updated, 1 files merged, 2 files removed, 1 files unresolved
|
|
There are unresolved merges with locally modified files.
|
|
You can finish the partial merge using:
|
|
hg update 0
|
|
hg update 1
|
|
2 files updated, 0 files merged, 3 files removed, 0 files unresolved
|
|
--- a/zzz1_merge_ok
|
|
+++ b/zzz1_merge_ok
|
|
+new first line
|
|
+new last line
|
|
--- a/zzz2_merge_bad
|
|
+++ b/zzz2_merge_bad
|
|
+another last line
|
|
+=======
|
|
+new last line
|
|
M zzz1_merge_ok
|
|
M zzz2_merge_bad
|
|
? zzz2_merge_bad.orig
|
|
# local merge without conflicts
|
|
merging zzz1_merge_ok
|
|
4 files updated, 1 files merged, 2 files removed, 0 files unresolved
|
|
--- a/zzz1_merge_ok
|
|
+++ b/zzz1_merge_ok
|
|
+new last line
|
|
M zzz1_merge_ok
|
|
? zzz2_merge_bad.orig
|