Show More
@@ -135,6 +135,9 b' def filemerge(repo, mynode, orig, fcd, f' | |||||
135 | if not fco.cmp(fcd.data()): # files identical? |
|
135 | if not fco.cmp(fcd.data()): # files identical? | |
136 | return None |
|
136 | return None | |
137 |
|
137 | |||
|
138 | if fca == fco: # backwards, use working dir parent as ancestor | |||
|
139 | fca = fcd.parents()[0] | |||
|
140 | ||||
138 | ui = repo.ui |
|
141 | ui = repo.ui | |
139 | fd = fcd.path() |
|
142 | fd = fcd.path() | |
140 | binary = isbin(fcd) or isbin(fco) or isbin(fca) |
|
143 | binary = isbin(fcd) or isbin(fco) or isbin(fca) |
@@ -82,7 +82,7 b' hg st' | |||||
82 | echo c >> a |
|
82 | echo c >> a | |
83 | hg st |
|
83 | hg st | |
84 |
|
84 | |||
85 | hg up 0 |
|
85 | HGMERGE=internal:local hg up 0 | |
86 | hg st |
|
86 | hg st | |
87 |
|
87 | |||
88 | HGMERGE=internal:local hg up |
|
88 | HGMERGE=internal:local hg up |
@@ -44,7 +44,6 b' removing h/h' | |||||
44 | A h |
|
44 | A h | |
45 | R h/h |
|
45 | R h/h | |
46 | M a |
|
46 | M a | |
47 | merging a |
|
|||
48 | 1 files updated, 1 files merged, 2 files removed, 0 files unresolved |
|
47 | 1 files updated, 1 files merged, 2 files removed, 0 files unresolved | |
49 | M a |
|
48 | M a | |
50 | 3 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
49 | 3 files updated, 1 files merged, 0 files removed, 0 files unresolved |
@@ -24,16 +24,20 b' 3 files updated, 1 files merged, 2 files' | |||||
24 | use 'hg resolve' to retry unresolved file merges |
|
24 | use 'hg resolve' to retry unresolved file merges | |
25 | merging zzz1_merge_ok |
|
25 | merging zzz1_merge_ok | |
26 | merging zzz2_merge_bad |
|
26 | merging zzz2_merge_bad | |
27 | 2 files updated, 2 files merged, 3 files removed, 0 files unresolved |
|
27 | warning: conflicts during merge. | |
|
28 | merging zzz2_merge_bad failed! | |||
|
29 | 2 files updated, 1 files merged, 3 files removed, 1 files unresolved | |||
|
30 | use 'hg resolve' to retry unresolved file merges | |||
28 | --- a/zzz1_merge_ok |
|
31 | --- a/zzz1_merge_ok | |
29 | +++ b/zzz1_merge_ok |
|
32 | +++ b/zzz1_merge_ok | |
30 | +new first line |
|
|||
31 | +new last line |
|
33 | +new last line | |
32 | --- a/zzz2_merge_bad |
|
34 | --- a/zzz2_merge_bad | |
33 | +++ b/zzz2_merge_bad |
|
35 | +++ b/zzz2_merge_bad | |
34 | +another last line |
|
36 | +another last line | |
|
37 | +======= | |||
35 | M zzz1_merge_ok |
|
38 | M zzz1_merge_ok | |
36 | M zzz2_merge_bad |
|
39 | M zzz2_merge_bad | |
|
40 | ? zzz2_merge_bad.orig | |||
37 | # local merge with conflicts |
|
41 | # local merge with conflicts | |
38 | merging zzz1_merge_ok |
|
42 | merging zzz1_merge_ok | |
39 | merging zzz2_merge_bad |
|
43 | merging zzz2_merge_bad | |
@@ -43,18 +47,23 b' 3 files updated, 1 files merged, 2 files' | |||||
43 | use 'hg resolve' to retry unresolved file merges |
|
47 | use 'hg resolve' to retry unresolved file merges | |
44 | merging zzz1_merge_ok |
|
48 | merging zzz1_merge_ok | |
45 | merging zzz2_merge_bad |
|
49 | merging zzz2_merge_bad | |
46 | 2 files updated, 2 files merged, 3 files removed, 0 files unresolved |
|
50 | warning: conflicts during merge. | |
|
51 | merging zzz2_merge_bad failed! | |||
|
52 | 2 files updated, 1 files merged, 3 files removed, 1 files unresolved | |||
|
53 | use 'hg resolve' to retry unresolved file merges | |||
47 | --- a/zzz1_merge_ok |
|
54 | --- a/zzz1_merge_ok | |
48 | +++ b/zzz1_merge_ok |
|
55 | +++ b/zzz1_merge_ok | |
49 | +new first line |
|
|||
50 | +new last line |
|
56 | +new last line | |
51 | --- a/zzz2_merge_bad |
|
57 | --- a/zzz2_merge_bad | |
52 | +++ b/zzz2_merge_bad |
|
58 | +++ b/zzz2_merge_bad | |
53 | +another last line |
|
59 | +another last line | |
54 | +======= |
|
60 | +======= | |
|
61 | +======= | |||
55 | +new last line |
|
62 | +new last line | |
|
63 | +======= | |||
56 | M zzz1_merge_ok |
|
64 | M zzz1_merge_ok | |
57 | M zzz2_merge_bad |
|
65 | M zzz2_merge_bad | |
|
66 | ? zzz2_merge_bad.orig | |||
58 | # local merge without conflicts |
|
67 | # local merge without conflicts | |
59 | merging zzz1_merge_ok |
|
68 | merging zzz1_merge_ok | |
60 | 4 files updated, 1 files merged, 2 files removed, 0 files unresolved |
|
69 | 4 files updated, 1 files merged, 2 files removed, 0 files unresolved |
@@ -48,8 +48,7 b' removing b' | |||||
48 | update: a 2/2 files (100.00%) |
|
48 | update: a 2/2 files (100.00%) | |
49 | picked tool 'true' for a (binary False symlink False) |
|
49 | picked tool 'true' for a (binary False symlink False) | |
50 | merging a |
|
50 | merging a | |
51 |
my a@802f095af299+ other a@33aaa84a386b ancestor a@ |
|
51 | my a@802f095af299+ other a@33aaa84a386b ancestor a@802f095af299 | |
52 | premerge successful |
|
|||
53 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved |
|
52 | 0 files updated, 1 files merged, 1 files removed, 0 files unresolved | |
54 | changeset: 0:33aaa84a386b |
|
53 | changeset: 0:33aaa84a386b | |
55 | user: test |
|
54 | user: test |
General Comments 0
You need to be logged in to leave comments.
Login now