Show More
@@ -850,9 +850,10 b' def applyupdates(repo, actions, wctx, mc' | |||
|
850 | 850 | util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
|
851 | 851 | updated += 1 |
|
852 | 852 | |
|
853 | # merge | |
|
853 | # premerge | |
|
854 | tocomplete = [] | |
|
854 | 855 | for f, args, msg in actions['m']: |
|
855 | repo.ui.debug(" %s: %s -> m\n" % (f, msg)) | |
|
856 | repo.ui.debug(" %s: %s -> m (premerge)\n" % (f, msg)) | |
|
856 | 857 | z += 1 |
|
857 | 858 | progress(_updating, z, item=f, total=numupdates, unit=_files) |
|
858 | 859 | if f == '.hgsubstate': # subrepo states need updating |
@@ -861,8 +862,24 b' def applyupdates(repo, actions, wctx, mc' | |||
|
861 | 862 | continue |
|
862 | 863 | audit(f) |
|
863 | 864 | complete, r = ms.preresolve(f, wctx, labels=labels) |
|
864 |
if |
|
|
865 | r = ms.resolve(f, wctx, labels=labels) | |
|
865 | if complete: | |
|
866 | if r is not None and r > 0: | |
|
867 | unresolved += 1 | |
|
868 | else: | |
|
869 | if r is None: | |
|
870 | updated += 1 | |
|
871 | else: | |
|
872 | merged += 1 | |
|
873 | else: | |
|
874 | numupdates += 1 | |
|
875 | tocomplete.append((f, args, msg)) | |
|
876 | ||
|
877 | # merge | |
|
878 | for f, args, msg in tocomplete: | |
|
879 | repo.ui.debug(" %s: %s -> m (merge)\n" % (f, msg)) | |
|
880 | z += 1 | |
|
881 | progress(_updating, z, item=f, total=numupdates, unit=_files) | |
|
882 | r = ms.resolve(f, wctx, labels=labels) | |
|
866 | 883 | if r is not None and r > 0: |
|
867 | 884 | unresolved += 1 |
|
868 | 885 | else: |
@@ -34,12 +34,12 b'' | |||
|
34 | 34 | preserving a for resolve of b |
|
35 | 35 | preserving a for resolve of c |
|
36 | 36 | removing a |
|
37 | b: remote moved from a -> m | |
|
37 | b: remote moved from a -> m (premerge) | |
|
38 | 38 | picked tool ':merge' for b (binary False symlink False) |
|
39 | 39 | merging a and b to b |
|
40 | 40 | my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
|
41 | 41 | premerge successful |
|
42 | c: remote moved from a -> m | |
|
42 | c: remote moved from a -> m (premerge) | |
|
43 | 43 | picked tool ':merge' for c (binary False symlink False) |
|
44 | 44 | merging a and c to c |
|
45 | 45 | my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
@@ -37,12 +37,12 b" we get conflicts that shouldn't be there" | |||
|
37 | 37 | ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 |
|
38 | 38 | preserving foo for resolve of bar |
|
39 | 39 | preserving foo for resolve of foo |
|
40 | bar: remote copied from foo -> m | |
|
40 | bar: remote copied from foo -> m (premerge) | |
|
41 | 41 | picked tool ':merge' for bar (binary False symlink False) |
|
42 | 42 | merging foo and bar to bar |
|
43 | 43 | my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc |
|
44 | 44 | premerge successful |
|
45 | foo: versions differ -> m | |
|
45 | foo: versions differ -> m (premerge) | |
|
46 | 46 | picked tool ':merge' for foo (binary False symlink False) |
|
47 | 47 | merging foo |
|
48 | 48 | my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc |
@@ -153,7 +153,7 b' Graft out of order, skipping a merge and' | |||
|
153 | 153 | branchmerge: True, force: True, partial: False |
|
154 | 154 | ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
|
155 | 155 | preserving b for resolve of b |
|
156 | b: local copied/moved from a -> m | |
|
156 | b: local copied/moved from a -> m (premerge) | |
|
157 | 157 | picked tool ':merge' for b (binary False symlink False) |
|
158 | 158 | merging b and a to b |
|
159 | 159 | my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 |
@@ -183,10 +183,11 b' Graft out of order, skipping a merge and' | |||
|
183 | 183 | d: remote is newer -> g |
|
184 | 184 | getting d |
|
185 | 185 | b: remote unchanged -> k |
|
186 | e: versions differ -> m | |
|
186 | e: versions differ -> m (premerge) | |
|
187 | 187 | picked tool ':merge' for e (binary False symlink False) |
|
188 | 188 | merging e |
|
189 | 189 | my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
|
190 | e: versions differ -> m (merge) | |
|
190 | 191 | picked tool ':merge' for e (binary False symlink False) |
|
191 | 192 | my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
|
192 | 193 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
@@ -65,7 +65,7 b' https://bz.mercurial-scm.org/672' | |||
|
65 | 65 | branchmerge: True, force: False, partial: False |
|
66 | 66 | ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
|
67 | 67 | preserving 1a for resolve of 1a |
|
68 | 1a: local copied/moved from 1 -> m | |
|
68 | 1a: local copied/moved from 1 -> m (premerge) | |
|
69 | 69 | picked tool ':merge' for 1a (binary False symlink False) |
|
70 | 70 | merging 1a and 1 to 1a |
|
71 | 71 | my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d |
@@ -88,7 +88,7 b' https://bz.mercurial-scm.org/672' | |||
|
88 | 88 | ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |
|
89 | 89 | preserving 1 for resolve of 1a |
|
90 | 90 | removing 1 |
|
91 | 1a: remote moved from 1 -> m | |
|
91 | 1a: remote moved from 1 -> m (premerge) | |
|
92 | 92 | picked tool ':merge' for 1a (binary False symlink False) |
|
93 | 93 | merging 1 and 1a to 1a |
|
94 | 94 | my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d |
@@ -124,9 +124,9 b' add some changesets to rename/remove/mer' | |||
|
124 | 124 | $ hg commit -q -m"remove large, normal3" |
|
125 | 125 | $ hg merge |
|
126 | 126 | merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat |
|
127 | merging sub/normal2 and stuff/normal2 to stuff/normal2 | |
|
127 | 128 | warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob) |
|
128 | 129 | warning: conflicts while merging stuff/maybelarge.dat! (edit, then use 'hg resolve --mark') |
|
129 | merging sub/normal2 and stuff/normal2 to stuff/normal2 | |
|
130 | 130 | 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
|
131 | 131 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
132 | 132 | [1] |
@@ -72,7 +72,7 b' This should use bar@rev2 as the ancestor' | |||
|
72 | 72 | branchmerge: True, force: False, partial: False |
|
73 | 73 | ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 |
|
74 | 74 | preserving bar for resolve of bar |
|
75 | bar: versions differ -> m | |
|
75 | bar: versions differ -> m (premerge) | |
|
76 | 76 | picked tool ':merge' for bar (binary False symlink False) |
|
77 | 77 | merging bar |
|
78 | 78 | my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 |
@@ -158,7 +158,7 b' This should use bar@rev2 as the ancestor' | |||
|
158 | 158 | branchmerge: True, force: False, partial: False |
|
159 | 159 | ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 |
|
160 | 160 | preserving bar for resolve of bar |
|
161 | bar: versions differ -> m | |
|
161 | bar: versions differ -> m (premerge) | |
|
162 | 162 | picked tool ':merge' for bar (binary False symlink False) |
|
163 | 163 | merging bar |
|
164 | 164 | my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 |
@@ -82,10 +82,11 b' Criss cross merging' | |||
|
82 | 82 | preserving f2 for resolve of f2 |
|
83 | 83 | f1: remote is newer -> g |
|
84 | 84 | getting f1 |
|
85 | f2: versions differ -> m | |
|
85 | f2: versions differ -> m (premerge) | |
|
86 | 86 | picked tool ':dump' for f2 (binary False symlink False) |
|
87 | 87 | merging f2 |
|
88 | 88 | my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c |
|
89 | f2: versions differ -> m (merge) | |
|
89 | 90 | picked tool ':dump' for f2 (binary False symlink False) |
|
90 | 91 | my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c |
|
91 | 92 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
@@ -192,27 +192,27 b' Merge with remote' | |||
|
192 | 192 | remote changed content1_content2_missing_missing-untracked which local deleted |
|
193 | 193 | use (c)hanged version or leave (d)eleted? c |
|
194 | 194 | merging content1_content2_content1_content4-tracked |
|
195 | warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark') | |
|
196 | 195 | merging content1_content2_content2_content1-tracked |
|
197 | 196 | merging content1_content2_content2_content4-tracked |
|
198 | warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') | |
|
199 | 197 | merging content1_content2_content3_content1-tracked |
|
200 | 198 | merging content1_content2_content3_content3-tracked |
|
201 | warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') | |
|
202 | 199 | merging content1_content2_content3_content4-tracked |
|
203 | warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') | |
|
204 | 200 | merging content1_content2_missing_content1-tracked |
|
205 | 201 | merging content1_content2_missing_content4-tracked |
|
202 | merging missing_content2_content2_content4-tracked | |
|
203 | merging missing_content2_content3_content3-tracked | |
|
204 | merging missing_content2_content3_content4-tracked | |
|
205 | merging missing_content2_missing_content4-tracked | |
|
206 | merging missing_content2_missing_content4-untracked | |
|
207 | warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark') | |
|
208 | warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') | |
|
209 | warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') | |
|
210 | warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') | |
|
206 | 211 | warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
|
207 | merging missing_content2_content2_content4-tracked | |
|
208 | 212 | warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') |
|
209 | merging missing_content2_content3_content3-tracked | |
|
210 | 213 | warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') |
|
211 | merging missing_content2_content3_content4-tracked | |
|
212 | 214 | warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark') |
|
213 | merging missing_content2_missing_content4-tracked | |
|
214 | 215 | warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark') |
|
215 | merging missing_content2_missing_content4-untracked | |
|
216 | 216 | warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark') |
|
217 | 217 | 39 files updated, 3 files merged, 8 files removed, 10 files unresolved |
|
218 | 218 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
@@ -35,7 +35,7 b' Symlink is local parent, executable is o' | |||
|
35 | 35 | branchmerge: True, force: False, partial: False |
|
36 | 36 | ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
|
37 | 37 | preserving a for resolve of a |
|
38 | a: versions differ -> m | |
|
38 | a: versions differ -> m (premerge) | |
|
39 | 39 | picked tool ':merge' for a (binary False symlink True) |
|
40 | 40 | merging a |
|
41 | 41 | my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da |
@@ -68,7 +68,7 b' Symlink is other parent, executable is l' | |||
|
68 | 68 | branchmerge: True, force: False, partial: False |
|
69 | 69 | ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
|
70 | 70 | preserving a for resolve of a |
|
71 | a: versions differ -> m | |
|
71 | a: versions differ -> m (premerge) | |
|
72 | 72 | picked tool ':union' for a (binary False symlink True) |
|
73 | 73 | merging a |
|
74 | 74 | my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
@@ -91,7 +91,7 b' Symlink is other parent, executable is l' | |||
|
91 | 91 | branchmerge: True, force: False, partial: False |
|
92 | 92 | ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
|
93 | 93 | preserving a for resolve of a |
|
94 | a: versions differ -> m | |
|
94 | a: versions differ -> m (premerge) | |
|
95 | 95 | picked tool ':merge3' for a (binary False symlink True) |
|
96 | 96 | merging a |
|
97 | 97 | my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
@@ -124,7 +124,7 b' Update to link with local change should ' | |||
|
124 | 124 | branchmerge: False, force: False, partial: False |
|
125 | 125 | ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f |
|
126 | 126 | preserving a for resolve of a |
|
127 | a: versions differ -> m | |
|
127 | a: versions differ -> m (premerge) | |
|
128 | 128 | (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) |
|
129 | 129 | picked tool ':prompt' for a (binary False symlink True) |
|
130 | 130 | no tool found to merge a |
@@ -283,10 +283,8 b' h: l vs l, different' | |||
|
283 | 283 | |
|
284 | 284 | $ hg merge |
|
285 | 285 | merging a |
|
286 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
|
287 | 286 | warning: cannot merge flags for b |
|
288 | 287 | merging b |
|
289 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |
|
290 | 288 | warning: cannot merge flags for c |
|
291 | 289 | merging d |
|
292 | 290 | warning: internal :merge cannot merge symlinks for d |
@@ -297,6 +295,8 b' h: l vs l, different' | |||
|
297 | 295 | merging h |
|
298 | 296 | warning: internal :merge cannot merge symlinks for h |
|
299 | 297 | warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
|
298 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
|
299 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |
|
300 | 300 | 3 files updated, 0 files merged, 0 files removed, 5 files unresolved |
|
301 | 301 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
302 | 302 | [1] |
@@ -342,10 +342,8 b' h: l vs l, different' | |||
|
342 | 342 | $ hg up -Cqr1 |
|
343 | 343 | $ hg merge |
|
344 | 344 | merging a |
|
345 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
|
346 | 345 | warning: cannot merge flags for b |
|
347 | 346 | merging b |
|
348 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |
|
349 | 347 | warning: cannot merge flags for c |
|
350 | 348 | merging d |
|
351 | 349 | warning: internal :merge cannot merge symlinks for d |
@@ -356,6 +354,8 b' h: l vs l, different' | |||
|
356 | 354 | merging h |
|
357 | 355 | warning: internal :merge cannot merge symlinks for h |
|
358 | 356 | warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
|
357 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
|
358 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | |
|
359 | 359 | 3 files updated, 0 files merged, 0 files removed, 5 files unresolved |
|
360 | 360 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
361 | 361 | [1] |
@@ -84,10 +84,11 b' pull and merge from test-a again' | |||
|
84 | 84 | branchmerge: True, force: False, partial: False |
|
85 | 85 | ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 |
|
86 | 86 | preserving test.txt for resolve of test.txt |
|
87 | test.txt: versions differ -> m | |
|
87 | test.txt: versions differ -> m (premerge) | |
|
88 | 88 | picked tool ':merge' for test.txt (binary False symlink False) |
|
89 | 89 | merging test.txt |
|
90 | 90 | my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
|
91 | test.txt: versions differ -> m (merge) | |
|
91 | 92 | picked tool ':merge' for test.txt (binary False symlink False) |
|
92 | 93 | my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 |
|
93 | 94 | warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark') |
@@ -27,8 +27,8 b' a file-level merge failed' | |||
|
27 | 27 | test with the rename on the remote side |
|
28 | 28 | $ HGMERGE=false hg merge |
|
29 | 29 | merging bar |
|
30 | merging foo and baz to baz | |
|
30 | 31 | merging bar failed! |
|
31 | merging foo and baz to baz | |
|
32 | 32 | 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
|
33 | 33 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
34 | 34 | [1] |
@@ -41,8 +41,8 b' test with the rename on the local side' | |||
|
41 | 41 | 3 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
42 | 42 | $ HGMERGE=false hg merge |
|
43 | 43 | merging bar |
|
44 | merging baz and foo to baz | |
|
44 | 45 | merging bar failed! |
|
45 | merging baz and foo to baz | |
|
46 | 46 | 1 files updated, 1 files merged, 0 files removed, 1 files unresolved |
|
47 | 47 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
48 | 48 | [1] |
@@ -40,7 +40,7 b'' | |||
|
40 | 40 | removing a |
|
41 | 41 | b2: remote created -> g |
|
42 | 42 | getting b2 |
|
43 | b: remote moved from a -> m | |
|
43 | b: remote moved from a -> m (premerge) | |
|
44 | 44 | picked tool ':merge' for b (binary False symlink False) |
|
45 | 45 | merging a and b to b |
|
46 | 46 | my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
@@ -89,15 +89,16 b' args:' | |||
|
89 | 89 | preserving a for resolve of b |
|
90 | 90 | preserving rev for resolve of rev |
|
91 | 91 | a: remote unchanged -> k |
|
92 | b: remote copied from a -> m | |
|
92 | b: remote copied from a -> m (premerge) | |
|
93 | 93 | picked tool 'python ../merge' for b (binary False symlink False) |
|
94 | 94 | merging a and b to b |
|
95 | 95 | my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
|
96 | 96 | premerge successful |
|
97 | rev: versions differ -> m | |
|
97 | rev: versions differ -> m (premerge) | |
|
98 | 98 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
99 | 99 | merging rev |
|
100 | 100 | my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
101 | rev: versions differ -> m (merge) | |
|
101 | 102 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
102 | 103 | my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
103 | 104 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -128,15 +129,16 b' args:' | |||
|
128 | 129 | preserving rev for resolve of rev |
|
129 | 130 | a: remote is newer -> g |
|
130 | 131 | getting a |
|
131 | b: local copied/moved from a -> m | |
|
132 | b: local copied/moved from a -> m (premerge) | |
|
132 | 133 | picked tool 'python ../merge' for b (binary False symlink False) |
|
133 | 134 | merging b and a to b |
|
134 | 135 | my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
135 | 136 | premerge successful |
|
136 | rev: versions differ -> m | |
|
137 | rev: versions differ -> m (premerge) | |
|
137 | 138 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
138 | 139 | merging rev |
|
139 | 140 | my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
141 | rev: versions differ -> m (merge) | |
|
140 | 142 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
141 | 143 | my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
142 | 144 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -166,15 +168,16 b' args:' | |||
|
166 | 168 | preserving a for resolve of b |
|
167 | 169 | preserving rev for resolve of rev |
|
168 | 170 | removing a |
|
169 | b: remote moved from a -> m | |
|
171 | b: remote moved from a -> m (premerge) | |
|
170 | 172 | picked tool 'python ../merge' for b (binary False symlink False) |
|
171 | 173 | merging a and b to b |
|
172 | 174 | my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
|
173 | 175 | premerge successful |
|
174 | rev: versions differ -> m | |
|
176 | rev: versions differ -> m (premerge) | |
|
175 | 177 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
176 | 178 | merging rev |
|
177 | 179 | my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
180 | rev: versions differ -> m (merge) | |
|
178 | 181 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
179 | 182 | my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
180 | 183 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -202,15 +205,16 b' args:' | |||
|
202 | 205 | ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 |
|
203 | 206 | preserving b for resolve of b |
|
204 | 207 | preserving rev for resolve of rev |
|
205 | b: local copied/moved from a -> m | |
|
208 | b: local copied/moved from a -> m (premerge) | |
|
206 | 209 | picked tool 'python ../merge' for b (binary False symlink False) |
|
207 | 210 | merging b and a to b |
|
208 | 211 | my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
209 | 212 | premerge successful |
|
210 | rev: versions differ -> m | |
|
213 | rev: versions differ -> m (premerge) | |
|
211 | 214 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
212 | 215 | merging rev |
|
213 | 216 | my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
217 | rev: versions differ -> m (merge) | |
|
214 | 218 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
215 | 219 | my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
216 | 220 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -239,10 +243,11 b' args:' | |||
|
239 | 243 | preserving rev for resolve of rev |
|
240 | 244 | b: remote created -> g |
|
241 | 245 | getting b |
|
242 | rev: versions differ -> m | |
|
246 | rev: versions differ -> m (premerge) | |
|
243 | 247 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
244 | 248 | merging rev |
|
245 | 249 | my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
250 | rev: versions differ -> m (merge) | |
|
246 | 251 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
247 | 252 | my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
248 | 253 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -269,10 +274,11 b' args:' | |||
|
269 | 274 | branchmerge: True, force: False, partial: False |
|
270 | 275 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 |
|
271 | 276 | preserving rev for resolve of rev |
|
272 | rev: versions differ -> m | |
|
277 | rev: versions differ -> m (premerge) | |
|
273 | 278 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
274 | 279 | merging rev |
|
275 | 280 | my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
281 | rev: versions differ -> m (merge) | |
|
276 | 282 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
277 | 283 | my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
278 | 284 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -303,10 +309,11 b' args:' | |||
|
303 | 309 | removing a |
|
304 | 310 | b: remote created -> g |
|
305 | 311 | getting b |
|
306 | rev: versions differ -> m | |
|
312 | rev: versions differ -> m (premerge) | |
|
307 | 313 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
308 | 314 | merging rev |
|
309 | 315 | my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
316 | rev: versions differ -> m (merge) | |
|
310 | 317 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
311 | 318 | my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
312 | 319 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -332,10 +339,11 b' args:' | |||
|
332 | 339 | branchmerge: True, force: False, partial: False |
|
333 | 340 | ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 |
|
334 | 341 | preserving rev for resolve of rev |
|
335 | rev: versions differ -> m | |
|
342 | rev: versions differ -> m (premerge) | |
|
336 | 343 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
337 | 344 | merging rev |
|
338 | 345 | my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
346 | rev: versions differ -> m (merge) | |
|
339 | 347 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
340 | 348 | my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
|
341 | 349 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -359,18 +367,20 b' args:' | |||
|
359 | 367 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
|
360 | 368 | preserving b for resolve of b |
|
361 | 369 | preserving rev for resolve of rev |
|
362 | b: both renamed from a -> m | |
|
370 | b: both renamed from a -> m (premerge) | |
|
363 | 371 | picked tool 'python ../merge' for b (binary False symlink False) |
|
364 | 372 | merging b |
|
365 | 373 | my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
|
374 | rev: versions differ -> m (premerge) | |
|
375 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
376 | merging rev | |
|
377 | my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 | |
|
378 | b: both renamed from a -> m (merge) | |
|
366 | 379 | picked tool 'python ../merge' for b (binary False symlink False) |
|
367 | 380 | my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
|
368 | 381 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
|
369 | 382 | merge tool returned: 0 |
|
370 | rev: versions differ -> m | |
|
371 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
372 | merging rev | |
|
373 | my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 | |
|
383 | rev: versions differ -> m (merge) | |
|
374 | 384 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
375 | 385 | my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
376 | 386 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -404,10 +414,11 b' m "um a c" "um x c" " " "10 do merg' | |||
|
404 | 414 | preserving rev for resolve of rev |
|
405 | 415 | c: remote created -> g |
|
406 | 416 | getting c |
|
407 | rev: versions differ -> m | |
|
417 | rev: versions differ -> m (premerge) | |
|
408 | 418 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
409 | 419 | merging rev |
|
410 | 420 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
|
421 | rev: versions differ -> m (merge) | |
|
411 | 422 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
412 | 423 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
|
413 | 424 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -435,18 +446,20 b' m "um a c" "um x c" " " "10 do merg' | |||
|
435 | 446 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
|
436 | 447 | preserving b for resolve of b |
|
437 | 448 | preserving rev for resolve of rev |
|
438 | b: both created -> m | |
|
449 | b: both created -> m (premerge) | |
|
439 | 450 | picked tool 'python ../merge' for b (binary False symlink False) |
|
440 | 451 | merging b |
|
441 | 452 | my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
|
453 | rev: versions differ -> m (premerge) | |
|
454 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
455 | merging rev | |
|
456 | my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 | |
|
457 | b: both created -> m (merge) | |
|
442 | 458 | picked tool 'python ../merge' for b (binary False symlink False) |
|
443 | 459 | my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
|
444 | 460 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
|
445 | 461 | merge tool returned: 0 |
|
446 | rev: versions differ -> m | |
|
447 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
448 | merging rev | |
|
449 | my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 | |
|
462 | rev: versions differ -> m (merge) | |
|
450 | 463 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
451 | 464 | my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
|
452 | 465 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -473,18 +486,20 b' m "um a c" "um x c" " " "10 do merg' | |||
|
473 | 486 | preserving rev for resolve of rev |
|
474 | 487 | a: other deleted -> r |
|
475 | 488 | removing a |
|
476 | b: both created -> m | |
|
489 | b: both created -> m (premerge) | |
|
477 | 490 | picked tool 'python ../merge' for b (binary False symlink False) |
|
478 | 491 | merging b |
|
479 | 492 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
493 | rev: versions differ -> m (premerge) | |
|
494 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
495 | merging rev | |
|
496 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | |
|
497 | b: both created -> m (merge) | |
|
480 | 498 | picked tool 'python ../merge' for b (binary False symlink False) |
|
481 | 499 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
482 | 500 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
|
483 | 501 | merge tool returned: 0 |
|
484 | rev: versions differ -> m | |
|
485 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
486 | merging rev | |
|
487 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | |
|
502 | rev: versions differ -> m (merge) | |
|
488 | 503 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
489 | 504 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
490 | 505 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -510,18 +525,20 b' m "um a c" "um x c" " " "10 do merg' | |||
|
510 | 525 | preserving rev for resolve of rev |
|
511 | 526 | a: remote is newer -> g |
|
512 | 527 | getting a |
|
513 | b: both created -> m | |
|
528 | b: both created -> m (premerge) | |
|
514 | 529 | picked tool 'python ../merge' for b (binary False symlink False) |
|
515 | 530 | merging b |
|
516 | 531 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
532 | rev: versions differ -> m (premerge) | |
|
533 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
534 | merging rev | |
|
535 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | |
|
536 | b: both created -> m (merge) | |
|
517 | 537 | picked tool 'python ../merge' for b (binary False symlink False) |
|
518 | 538 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
519 | 539 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
|
520 | 540 | merge tool returned: 0 |
|
521 | rev: versions differ -> m | |
|
522 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
523 | merging rev | |
|
524 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | |
|
541 | rev: versions differ -> m (merge) | |
|
525 | 542 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
526 | 543 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
527 | 544 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -548,18 +565,20 b' m "um a c" "um x c" " " "10 do merg' | |||
|
548 | 565 | preserving rev for resolve of rev |
|
549 | 566 | a: other deleted -> r |
|
550 | 567 | removing a |
|
551 | b: both created -> m | |
|
568 | b: both created -> m (premerge) | |
|
552 | 569 | picked tool 'python ../merge' for b (binary False symlink False) |
|
553 | 570 | merging b |
|
554 | 571 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
572 | rev: versions differ -> m (premerge) | |
|
573 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
574 | merging rev | |
|
575 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | |
|
576 | b: both created -> m (merge) | |
|
555 | 577 | picked tool 'python ../merge' for b (binary False symlink False) |
|
556 | 578 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
557 | 579 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
|
558 | 580 | merge tool returned: 0 |
|
559 | rev: versions differ -> m | |
|
560 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
561 | merging rev | |
|
562 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 | |
|
581 | rev: versions differ -> m (merge) | |
|
563 | 582 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
564 | 583 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
565 | 584 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -585,18 +604,20 b' m "um a c" "um x c" " " "10 do merg' | |||
|
585 | 604 | preserving rev for resolve of rev |
|
586 | 605 | a: remote is newer -> g |
|
587 | 606 | getting a |
|
588 | b: both created -> m | |
|
607 | b: both created -> m (premerge) | |
|
589 | 608 | picked tool 'python ../merge' for b (binary False symlink False) |
|
590 | 609 | merging b |
|
591 | 610 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
611 | rev: versions differ -> m (premerge) | |
|
612 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
613 | merging rev | |
|
614 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | |
|
615 | b: both created -> m (merge) | |
|
592 | 616 | picked tool 'python ../merge' for b (binary False symlink False) |
|
593 | 617 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
594 | 618 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
|
595 | 619 | merge tool returned: 0 |
|
596 | rev: versions differ -> m | |
|
597 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
598 | merging rev | |
|
599 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 | |
|
620 | rev: versions differ -> m (merge) | |
|
600 | 621 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
601 | 622 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
602 | 623 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -622,18 +643,20 b' m "um a c" "um x c" " " "10 do merg' | |||
|
622 | 643 | preserving b for resolve of b |
|
623 | 644 | preserving rev for resolve of rev |
|
624 | 645 | a: remote unchanged -> k |
|
625 | b: both created -> m | |
|
646 | b: both created -> m (premerge) | |
|
626 | 647 | picked tool 'python ../merge' for b (binary False symlink False) |
|
627 | 648 | merging b |
|
628 | 649 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
|
650 | rev: versions differ -> m (premerge) | |
|
651 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
652 | merging rev | |
|
653 | my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
|
654 | b: both created -> m (merge) | |
|
629 | 655 | picked tool 'python ../merge' for b (binary False symlink False) |
|
630 | 656 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
|
631 | 657 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
|
632 | 658 | merge tool returned: 0 |
|
633 | rev: versions differ -> m | |
|
634 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
635 | merging rev | |
|
636 | my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 | |
|
659 | rev: versions differ -> m (merge) | |
|
637 | 660 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
638 | 661 | my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
|
639 | 662 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -662,18 +685,20 b' m "um a c" "um x c" " " "10 do merg' | |||
|
662 | 685 | preserving rev for resolve of rev |
|
663 | 686 | a: prompt recreating -> g |
|
664 | 687 | getting a |
|
665 | b: both created -> m | |
|
688 | b: both created -> m (premerge) | |
|
666 | 689 | picked tool 'python ../merge' for b (binary False symlink False) |
|
667 | 690 | merging b |
|
668 | 691 | my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
|
692 | rev: versions differ -> m (premerge) | |
|
693 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
694 | merging rev | |
|
695 | my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 | |
|
696 | b: both created -> m (merge) | |
|
669 | 697 | picked tool 'python ../merge' for b (binary False symlink False) |
|
670 | 698 | my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
|
671 | 699 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
|
672 | 700 | merge tool returned: 0 |
|
673 | rev: versions differ -> m | |
|
674 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
675 | merging rev | |
|
676 | my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 | |
|
701 | rev: versions differ -> m (merge) | |
|
677 | 702 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
678 | 703 | my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
|
679 | 704 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -701,18 +726,20 b' m "um a c" "um x c" " " "10 do merg' | |||
|
701 | 726 | preserving b for resolve of b |
|
702 | 727 | preserving rev for resolve of rev |
|
703 | 728 | a: prompt keep -> a |
|
704 | b: both created -> m | |
|
729 | b: both created -> m (premerge) | |
|
705 | 730 | picked tool 'python ../merge' for b (binary False symlink False) |
|
706 | 731 | merging b |
|
707 | 732 | my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
|
733 | rev: versions differ -> m (premerge) | |
|
734 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
735 | merging rev | |
|
736 | my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 | |
|
737 | b: both created -> m (merge) | |
|
708 | 738 | picked tool 'python ../merge' for b (binary False symlink False) |
|
709 | 739 | my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
|
710 | 740 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
|
711 | 741 | merge tool returned: 0 |
|
712 | rev: versions differ -> m | |
|
713 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
714 | merging rev | |
|
715 | my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 | |
|
742 | rev: versions differ -> m (merge) | |
|
716 | 743 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
717 | 744 | my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
|
718 | 745 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -741,18 +768,20 b' m "um a c" "um x c" " " "10 do merg' | |||
|
741 | 768 | preserving a for resolve of b |
|
742 | 769 | preserving rev for resolve of rev |
|
743 | 770 | removing a |
|
744 | b: remote moved from a -> m | |
|
771 | b: remote moved from a -> m (premerge) | |
|
745 | 772 | picked tool 'python ../merge' for b (binary False symlink False) |
|
746 | 773 | merging a and b to b |
|
747 | 774 | my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
|
775 | rev: versions differ -> m (premerge) | |
|
776 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
777 | merging rev | |
|
778 | my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 | |
|
779 | b: remote moved from a -> m (merge) | |
|
748 | 780 | picked tool 'python ../merge' for b (binary False symlink False) |
|
749 | 781 | my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
|
750 | 782 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
|
751 | 783 | merge tool returned: 0 |
|
752 | rev: versions differ -> m | |
|
753 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
754 | merging rev | |
|
755 | my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 | |
|
784 | rev: versions differ -> m (merge) | |
|
756 | 785 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
757 | 786 | my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
|
758 | 787 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -780,18 +809,20 b' m "um a c" "um x c" " " "10 do merg' | |||
|
780 | 809 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 |
|
781 | 810 | preserving b for resolve of b |
|
782 | 811 | preserving rev for resolve of rev |
|
783 | b: local copied/moved from a -> m | |
|
812 | b: local copied/moved from a -> m (premerge) | |
|
784 | 813 | picked tool 'python ../merge' for b (binary False symlink False) |
|
785 | 814 | merging b and a to b |
|
786 | 815 | my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
816 | rev: versions differ -> m (premerge) | |
|
817 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
818 | merging rev | |
|
819 | my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
|
820 | b: local copied/moved from a -> m (merge) | |
|
787 | 821 | picked tool 'python ../merge' for b (binary False symlink False) |
|
788 | 822 | my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
789 | 823 | launching merge tool: python ../merge *$TESTTMP/t/t/b* * * (glob) |
|
790 | 824 | merge tool returned: 0 |
|
791 | rev: versions differ -> m | |
|
792 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
793 | merging rev | |
|
794 | my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 | |
|
825 | rev: versions differ -> m (merge) | |
|
795 | 826 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
796 | 827 | my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
|
797 | 828 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -826,15 +857,16 b' m "nm a b" "um x a" " " "22 get a, ' | |||
|
826 | 857 | preserving rev for resolve of rev |
|
827 | 858 | c: remote created -> g |
|
828 | 859 | getting c |
|
829 | b: local copied/moved from a -> m | |
|
860 | b: local copied/moved from a -> m (premerge) | |
|
830 | 861 | picked tool 'python ../merge' for b (binary False symlink False) |
|
831 | 862 | merging b and a to b |
|
832 | 863 | my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
|
833 | 864 | premerge successful |
|
834 | rev: versions differ -> m | |
|
865 | rev: versions differ -> m (premerge) | |
|
835 | 866 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
836 | 867 | merging rev |
|
837 | 868 | my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
|
869 | rev: versions differ -> m (merge) | |
|
838 | 870 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
839 | 871 | my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
|
840 | 872 | launching merge tool: python ../merge *$TESTTMP/t/t/rev* * * (glob) |
@@ -325,8 +325,8 b" test 'resolve -l'" | |||
|
325 | 325 | created new head |
|
326 | 326 | $ hg merge |
|
327 | 327 | merging a |
|
328 | merging b | |
|
328 | 329 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
329 | merging b | |
|
330 | 330 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
|
331 | 331 | 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
|
332 | 332 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
@@ -259,7 +259,7 b' merge tests' | |||
|
259 | 259 | resolving manifests |
|
260 | 260 | branchmerge: True, force: False, partial: False |
|
261 | 261 | ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4 |
|
262 | .hgsubstate: versions differ -> m | |
|
262 | .hgsubstate: versions differ -> m (premerge) | |
|
263 | 263 | subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
|
264 | 264 | subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
|
265 | 265 | getting subrepo t |
@@ -285,7 +285,7 b' merge tests' | |||
|
285 | 285 | resolving manifests |
|
286 | 286 | branchmerge: True, force: False, partial: False |
|
287 | 287 | ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf |
|
288 | .hgsubstate: versions differ -> m | |
|
288 | .hgsubstate: versions differ -> m (premerge) | |
|
289 | 289 | subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
|
290 | 290 | subrepo t: both sides changed |
|
291 | 291 | subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) |
@@ -296,10 +296,11 b' merge tests' | |||
|
296 | 296 | branchmerge: True, force: False, partial: False |
|
297 | 297 | ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
|
298 | 298 | preserving t for resolve of t |
|
299 | t: versions differ -> m | |
|
299 | t: versions differ -> m (premerge) | |
|
300 | 300 | picked tool ':merge' for t (binary False symlink False) |
|
301 | 301 | merging t |
|
302 | 302 | my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
|
303 | t: versions differ -> m (merge) | |
|
303 | 304 | picked tool ':merge' for t (binary False symlink False) |
|
304 | 305 | my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
|
305 | 306 | warning: conflicts while merging t! (edit, then use 'hg resolve --mark') |
@@ -49,10 +49,11 b'' | |||
|
49 | 49 | preserving a for resolve of a |
|
50 | 50 | b: remote created -> g |
|
51 | 51 | getting b |
|
52 | a: versions differ -> m | |
|
52 | a: versions differ -> m (premerge) | |
|
53 | 53 | picked tool 'true' for a (binary False symlink False) |
|
54 | 54 | merging a |
|
55 | 55 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
|
56 | a: versions differ -> m (merge) | |
|
56 | 57 | picked tool 'true' for a (binary False symlink False) |
|
57 | 58 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
|
58 | 59 | launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
@@ -72,10 +73,11 b'' | |||
|
72 | 73 | preserving a for resolve of a |
|
73 | 74 | b: other deleted -> r |
|
74 | 75 | removing b |
|
75 | a: versions differ -> m | |
|
76 | a: versions differ -> m (premerge) | |
|
76 | 77 | picked tool 'true' for a (binary False symlink False) |
|
77 | 78 | merging a |
|
78 | 79 | my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
|
80 | a: versions differ -> m (merge) | |
|
79 | 81 | picked tool 'true' for a (binary False symlink False) |
|
80 | 82 | my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb |
|
81 | 83 | launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
@@ -103,10 +105,11 b'' | |||
|
103 | 105 | preserving a for resolve of a |
|
104 | 106 | b: remote created -> g |
|
105 | 107 | getting b |
|
106 | a: versions differ -> m | |
|
108 | a: versions differ -> m (premerge) | |
|
107 | 109 | picked tool 'true' for a (binary False symlink False) |
|
108 | 110 | merging a |
|
109 | 111 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
|
112 | a: versions differ -> m (merge) | |
|
110 | 113 | picked tool 'true' for a (binary False symlink False) |
|
111 | 114 | my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a |
|
112 | 115 | launching merge tool: true *$TESTTMP/r2/a* * * (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now