Mercurial > hg

comparison tests/test-merge-local.out @ 8742:a964ab624385

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: allow merging going backwards 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?
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 92ccccb55ba3
children 6f1894d6a6b0
comparison
equal deleted inserted replaced
8741:e592180ba435 8742:a964ab624385
20 merging zzz1_merge_ok 20 merging zzz1_merge_ok
21 merging zzz2_merge_bad 21 merging zzz2_merge_bad
22 merging zzz2_merge_bad failed! 22 merging zzz2_merge_bad failed!
23 3 files updated, 1 files merged, 2 files removed, 1 files unresolved 23 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
24 use 'hg resolve' to retry unresolved file merges 24 use 'hg resolve' to retry unresolved file merges
25 2 files updated, 0 files merged, 3 files removed, 0 files unresolved 25 merging zzz1_merge_ok
26 merging zzz2_merge_bad
27 2 files updated, 2 files merged, 3 files removed, 0 files unresolved
26 --- a/zzz1_merge_ok 28 --- a/zzz1_merge_ok
27 +++ b/zzz1_merge_ok 29 +++ b/zzz1_merge_ok
28 +new first line 30 +new first line
29 +new last line 31 +new last line
30 --- a/zzz2_merge_bad 32 --- a/zzz2_merge_bad
31 +++ b/zzz2_merge_bad 33 +++ b/zzz2_merge_bad
32 +another last line 34 +another last line
33 M zzz1_merge_ok 35 M zzz1_merge_ok
34 M zzz2_merge_bad 36 M zzz2_merge_bad
35 ? zzz2_merge_bad.orig
36 # local merge with conflicts 37 # local merge with conflicts
37 merging zzz1_merge_ok 38 merging zzz1_merge_ok
38 merging zzz2_merge_bad 39 merging zzz2_merge_bad
39 warning: conflicts during merge. 40 warning: conflicts during merge.
40 merging zzz2_merge_bad failed! 41 merging zzz2_merge_bad failed!
41 3 files updated, 1 files merged, 2 files removed, 1 files unresolved 42 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
42 use 'hg resolve' to retry unresolved file merges 43 use 'hg resolve' to retry unresolved file merges
43 2 files updated, 0 files merged, 3 files removed, 0 files unresolved 44 merging zzz1_merge_ok
45 merging zzz2_merge_bad
46 2 files updated, 2 files merged, 3 files removed, 0 files unresolved
44 --- a/zzz1_merge_ok 47 --- a/zzz1_merge_ok
45 +++ b/zzz1_merge_ok 48 +++ b/zzz1_merge_ok
46 +new first line 49 +new first line
47 +new last line 50 +new last line
48 --- a/zzz2_merge_bad 51 --- a/zzz2_merge_bad
50 +another last line 53 +another last line
51 +======= 54 +=======
52 +new last line 55 +new last line
53 M zzz1_merge_ok 56 M zzz1_merge_ok
54 M zzz2_merge_bad 57 M zzz2_merge_bad
55 ? zzz2_merge_bad.orig
56 # local merge without conflicts 58 # local merge without conflicts
57 merging zzz1_merge_ok 59 merging zzz1_merge_ok
58 4 files updated, 1 files merged, 2 files removed, 0 files unresolved 60 4 files updated, 1 files merged, 2 files removed, 0 files unresolved
59 --- a/zzz1_merge_ok 61 --- a/zzz1_merge_ok
60 +++ b/zzz1_merge_ok 62 +++ b/zzz1_merge_ok