mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
e7ff3ff5bc
New behavior is generally superior and more correct, except possibly
with regards to missing files. hg up . is now effectively a no-op,
which is probably the desired behavior for people expecting to move to
tip, but may surprise people who were expecting deleted files to
reappear.
case 1: update to .
a-w -> a-w
classic: ancestor a
missing recreated right?
rmed recreated WRONG
added forgotten WRONG
changed preserved RIGHT
conflicted can't happen
backward merge: ancestor a (NO EFFECT)
missing missing wrong?
rm'ed rm'ed RIGHT
added preserved RIGHT
changed preserved RIGHT
conflicted can't happen
case 2: update to ancestor of .
a-b-w -> b-w
\
a
classic: ancestor a
missing recreated right?
rmed recreated wrong?
added forgotten wrong?
changed preserved RIGHT
conflicted preserved wrong?
backwards merge: ancestor b
missing missing or conflict right?
rm'ed missing or conflict right?
changed preserved RIGHT
conflicted merge RIGHT
added preserved right?
66 lines
1.6 KiB
Plaintext
66 lines
1.6 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
|
|
use 'hg resolve' to retry unresolved file merges
|
|
merging zzz1_merge_ok
|
|
merging zzz2_merge_bad
|
|
2 files updated, 2 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
|
|
# 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
|
|
use 'hg resolve' to retry unresolved file merges
|
|
merging zzz1_merge_ok
|
|
merging zzz2_merge_bad
|
|
2 files updated, 2 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
|
|
# 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
|