##// END OF EJS Templates
mergestate: merge `preresolve()` into `resolve()`...
Martin von Zweigbergk -
r49256:38941a28 default
parent child Browse files
Show More
@@ -6130,7 +6130,6 b' def resolve(ui, repo, *pats, **opts):'
6130 ret = 0
6130 ret = 0
6131 didwork = False
6131 didwork = False
6132
6132
6133 tocomplete = []
6134 hasconflictmarkers = []
6133 hasconflictmarkers = []
6135 if mark:
6134 if mark:
6136 markcheck = ui.config(b'commands', b'resolve.mark-check')
6135 markcheck = ui.config(b'commands', b'resolve.mark-check')
@@ -6183,24 +6182,20 b' def resolve(ui, repo, *pats, **opts):'
6183 # preresolve file
6182 # preresolve file
6184 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6183 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6185 with ui.configoverride(overrides, b'resolve'):
6184 with ui.configoverride(overrides, b'resolve'):
6186 complete, r = ms.preresolve(f, wctx)
6185 r = ms.resolve(f, wctx)
6187 if not complete:
6186 if r:
6188 tocomplete.append(f)
6189 elif r:
6190 ret = 1
6187 ret = 1
6191 finally:
6188 finally:
6192 ms.commit()
6189 ms.commit()
6193
6190
6194 # replace filemerge's .orig file with our resolve file, but only
6191 # replace filemerge's .orig file with our resolve file
6195 # for merges that are complete
6192 try:
6196 if complete:
6193 util.rename(
6197 try:
6194 a + b".resolve", scmutil.backuppath(ui, repo, f)
6198 util.rename(
6195 )
6199 a + b".resolve", scmutil.backuppath(ui, repo, f)
6196 except OSError as inst:
6200 )
6197 if inst.errno != errno.ENOENT:
6201 except OSError as inst:
6198 raise
6202 if inst.errno != errno.ENOENT:
6203 raise
6204
6199
6205 if hasconflictmarkers:
6200 if hasconflictmarkers:
6206 ui.warn(
6201 ui.warn(
@@ -6218,25 +6213,6 b' def resolve(ui, repo, *pats, **opts):'
6218 hint=_(b'use --all to mark anyway'),
6213 hint=_(b'use --all to mark anyway'),
6219 )
6214 )
6220
6215
6221 for f in tocomplete:
6222 try:
6223 # resolve file
6224 overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')}
6225 with ui.configoverride(overrides, b'resolve'):
6226 r = ms.resolve(f, wctx)
6227 if r:
6228 ret = 1
6229 finally:
6230 ms.commit()
6231
6232 # replace filemerge's .orig file with our resolve file
6233 a = repo.wjoin(f)
6234 try:
6235 util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f))
6236 except OSError as inst:
6237 if inst.errno != errno.ENOENT:
6238 raise
6239
6240 ms.commit()
6216 ms.commit()
6241 branchmerge = repo.dirstate.p2() != repo.nullid
6217 branchmerge = repo.dirstate.p2() != repo.nullid
6242 # resolve is not doing a parent change here, however, `record updates`
6218 # resolve is not doing a parent change here, however, `record updates`
@@ -1718,10 +1718,8 b' def applyupdates('
1718 )
1718 )
1719
1719
1720 try:
1720 try:
1721 # premerge
1722 tocomplete = []
1723 for f, args, msg in mergeactions:
1721 for f, args, msg in mergeactions:
1724 repo.ui.debug(b" %s: %s -> m (premerge)\n" % (f, msg))
1722 repo.ui.debug(b" %s: %s -> m\n" % (f, msg))
1725 ms.addcommitinfo(f, {b'merged': b'yes'})
1723 ms.addcommitinfo(f, {b'merged': b'yes'})
1726 progress.increment(item=f)
1724 progress.increment(item=f)
1727 if f == b'.hgsubstate': # subrepo states need updating
1725 if f == b'.hgsubstate': # subrepo states need updating
@@ -1730,16 +1728,6 b' def applyupdates('
1730 )
1728 )
1731 continue
1729 continue
1732 wctx[f].audit()
1730 wctx[f].audit()
1733 complete, r = ms.preresolve(f, wctx)
1734 if not complete:
1735 numupdates += 1
1736 tocomplete.append((f, args, msg))
1737
1738 # merge
1739 for f, args, msg in tocomplete:
1740 repo.ui.debug(b" %s: %s -> m (merge)\n" % (f, msg))
1741 ms.addcommitinfo(f, {b'merged': b'yes'})
1742 progress.increment(item=f, total=numupdates)
1743 ms.resolve(f, wctx)
1731 ms.resolve(f, wctx)
1744
1732
1745 except error.InterventionRequired:
1733 except error.InterventionRequired:
@@ -408,17 +408,14 b' class _mergestate_base(object):'
408
408
409 return complete, merge_ret
409 return complete, merge_ret
410
410
411 def preresolve(self, dfile, wctx):
412 """run premerge process for dfile
413
414 Returns whether the merge is complete, and the exit code."""
415 return self._resolve(True, dfile, wctx)
416
417 def resolve(self, dfile, wctx):
411 def resolve(self, dfile, wctx):
418 """run merge process (assuming premerge was run) for dfile
412 """run merge process for dfile
419
413
420 Returns the exit code of the merge."""
414 Returns the exit code of the merge."""
421 return self._resolve(False, dfile, wctx)[1]
415 complete, r = self._resolve(True, dfile, wctx)
416 if not complete:
417 r = self._resolve(False, dfile, wctx)[1]
418 return r
422
419
423 def counts(self):
420 def counts(self):
424 """return counts for updated, merged and removed files in this
421 """return counts for updated, merged and removed files in this
@@ -104,12 +104,12 b' Test Simple Merge'
104 preserving a for resolve of b
104 preserving a for resolve of b
105 preserving a for resolve of c
105 preserving a for resolve of c
106 removing a
106 removing a
107 b: remote moved from a -> m (premerge)
107 b: remote moved from a -> m
108 picked tool ':merge' for b (binary False symlink False changedelete False)
108 picked tool ':merge' for b (binary False symlink False changedelete False)
109 merging a and b to b
109 merging a and b to b
110 my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
110 my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
111 premerge successful
111 premerge successful
112 c: remote moved from a -> m (premerge)
112 c: remote moved from a -> m
113 picked tool ':merge' for c (binary False symlink False changedelete False)
113 picked tool ':merge' for c (binary False symlink False changedelete False)
114 merging a and c to c
114 merging a and c to c
115 my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
115 my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
@@ -38,12 +38,12 b" we get conflicts that shouldn't be there"
38 starting 4 threads for background file closing (?)
38 starting 4 threads for background file closing (?)
39 preserving foo for resolve of bar
39 preserving foo for resolve of bar
40 preserving foo for resolve of foo
40 preserving foo for resolve of foo
41 bar: remote copied from foo -> m (premerge)
41 bar: remote copied from foo -> m
42 picked tool ':merge' for bar (binary False symlink False changedelete False)
42 picked tool ':merge' for bar (binary False symlink False changedelete False)
43 merging foo and bar to bar
43 merging foo and bar to bar
44 my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
44 my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
45 premerge successful
45 premerge successful
46 foo: versions differ -> m (premerge)
46 foo: versions differ -> m
47 picked tool ':merge' for foo (binary False symlink False changedelete False)
47 picked tool ':merge' for foo (binary False symlink False changedelete False)
48 merging foo
48 merging foo
49 my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc
49 my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc
@@ -212,7 +212,7 b' Graft out of order, skipping a merge and'
212 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
212 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
213 starting 4 threads for background file closing (?)
213 starting 4 threads for background file closing (?)
214 preserving b for resolve of b
214 preserving b for resolve of b
215 b: local copied/moved from a -> m (premerge)
215 b: local copied/moved from a -> m
216 picked tool ':merge' for b (binary False symlink False changedelete False)
216 picked tool ':merge' for b (binary False symlink False changedelete False)
217 merging b and a to b
217 merging b and a to b
218 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
218 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
@@ -242,11 +242,10 b' Graft out of order, skipping a merge and'
242 d: remote is newer -> g
242 d: remote is newer -> g
243 getting d
243 getting d
244 preserving e for resolve of e
244 preserving e for resolve of e
245 e: versions differ -> m (premerge)
245 e: versions differ -> m
246 picked tool ':merge' for e (binary False symlink False changedelete False)
246 picked tool ':merge' for e (binary False symlink False changedelete False)
247 merging e
247 merging e
248 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
248 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
249 e: versions differ -> m (merge)
250 picked tool ':merge' for e (binary False symlink False changedelete False)
249 picked tool ':merge' for e (binary False symlink False changedelete False)
251 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
250 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
252 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
251 warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
@@ -855,8 +854,8 b' graft --continue after --base with confl'
855 $ hg graft -r 6 --base 5
854 $ hg graft -r 6 --base 5
856 grafting 6:25a2b029d3ae "6"
855 grafting 6:25a2b029d3ae "6"
857 merging d
856 merging d
857 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
858 merging e
858 merging e
859 warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
860 abort: unresolved conflicts, can't continue
859 abort: unresolved conflicts, can't continue
861 (use 'hg resolve' and 'hg graft --continue')
860 (use 'hg resolve' and 'hg graft --continue')
862 [1]
861 [1]
@@ -65,7 +65,7 b' https://bz.mercurial-scm.org/672'
65 ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
65 ancestor: c64f439569a9, local: f4a9cff3cd0b+, remote: 746e9549ea96
66 starting 4 threads for background file closing (?)
66 starting 4 threads for background file closing (?)
67 preserving 1a for resolve of 1a
67 preserving 1a for resolve of 1a
68 1a: local copied/moved from 1 -> m (premerge)
68 1a: local copied/moved from 1 -> m
69 picked tool ':merge' for 1a (binary False symlink False changedelete False)
69 picked tool ':merge' for 1a (binary False symlink False changedelete False)
70 merging 1a and 1 to 1a
70 merging 1a and 1 to 1a
71 my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9
71 my 1a@f4a9cff3cd0b+ other 1@746e9549ea96 ancestor 1@c64f439569a9
@@ -89,7 +89,7 b' https://bz.mercurial-scm.org/672'
89 starting 4 threads for background file closing (?)
89 starting 4 threads for background file closing (?)
90 preserving 1 for resolve of 1a
90 preserving 1 for resolve of 1a
91 removing 1
91 removing 1
92 1a: remote moved from 1 -> m (premerge)
92 1a: remote moved from 1 -> m
93 picked tool ':merge' for 1a (binary False symlink False changedelete False)
93 picked tool ':merge' for 1a (binary False symlink False changedelete False)
94 merging 1 and 1a to 1a
94 merging 1 and 1a to 1a
95 my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9
95 my 1a@746e9549ea96+ other 1a@f4a9cff3cd0b ancestor 1@c64f439569a9
@@ -72,7 +72,7 b' This should use bar@rev2 as the ancestor'
72 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
72 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
73 starting 4 threads for background file closing (?)
73 starting 4 threads for background file closing (?)
74 preserving bar for resolve of bar
74 preserving bar for resolve of bar
75 bar: versions differ -> m (premerge)
75 bar: versions differ -> m
76 picked tool ':merge' for bar (binary False symlink False changedelete False)
76 picked tool ':merge' for bar (binary False symlink False changedelete False)
77 merging bar
77 merging bar
78 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
78 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
@@ -159,7 +159,7 b' This should use bar@rev2 as the ancestor'
159 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
159 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
160 starting 4 threads for background file closing (?)
160 starting 4 threads for background file closing (?)
161 preserving bar for resolve of bar
161 preserving bar for resolve of bar
162 bar: versions differ -> m (premerge)
162 bar: versions differ -> m
163 picked tool ':merge' for bar (binary False symlink False changedelete False)
163 picked tool ':merge' for bar (binary False symlink False changedelete False)
164 merging bar
164 merging bar
165 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
165 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
@@ -93,11 +93,10 b' Criss cross merging'
93 f1: remote is newer -> g
93 f1: remote is newer -> g
94 getting f1
94 getting f1
95 preserving f2 for resolve of f2
95 preserving f2 for resolve of f2
96 f2: versions differ -> m (premerge)
96 f2: versions differ -> m
97 picked tool ':dump' for f2 (binary False symlink False changedelete False)
97 picked tool ':dump' for f2 (binary False symlink False changedelete False)
98 merging f2
98 merging f2
99 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527
99 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527
100 f2: versions differ -> m (merge)
101 picked tool ':dump' for f2 (binary False symlink False changedelete False)
100 picked tool ':dump' for f2 (binary False symlink False changedelete False)
102 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527
101 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527
103 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
102 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -218,27 +218,27 b' Merge with remote'
218 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
218 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
219 What do you want to do? u
219 What do you want to do? u
220 merging content1_content2_content1_content4-tracked
220 merging content1_content2_content1_content4-tracked
221 warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
221 merging content1_content2_content2_content1-tracked
222 merging content1_content2_content2_content1-tracked
222 merging content1_content2_content2_content4-tracked
223 merging content1_content2_content2_content4-tracked
224 warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
223 merging content1_content2_content3_content1-tracked
225 merging content1_content2_content3_content1-tracked
224 merging content1_content2_content3_content3-tracked
226 merging content1_content2_content3_content3-tracked
227 warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
225 merging content1_content2_content3_content4-tracked
228 merging content1_content2_content3_content4-tracked
229 warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
226 merging content1_content2_missing_content1-tracked
230 merging content1_content2_missing_content1-tracked
227 merging content1_content2_missing_content4-tracked
231 merging content1_content2_missing_content4-tracked
232 warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
228 merging missing_content2_content2_content4-tracked
233 merging missing_content2_content2_content4-tracked
234 warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
229 merging missing_content2_content3_content3-tracked
235 merging missing_content2_content3_content3-tracked
236 warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
230 merging missing_content2_content3_content4-tracked
237 merging missing_content2_content3_content4-tracked
238 warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
231 merging missing_content2_missing_content4-tracked
239 merging missing_content2_missing_content4-tracked
240 warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
232 merging missing_content2_missing_content4-untracked
241 merging missing_content2_missing_content4-untracked
233 warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
234 warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
235 warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
236 warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
237 warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
238 warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
239 warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
240 warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
241 warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
242 warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
242 warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
243 18 files updated, 3 files merged, 8 files removed, 35 files unresolved
243 18 files updated, 3 files merged, 8 files removed, 35 files unresolved
244 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
244 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
@@ -735,6 +735,7 b' Re-resolve and check status'
735 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
735 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
736 What do you want to do? u
736 What do you want to do? u
737 merging content1_content2_content1_content4-tracked
737 merging content1_content2_content1_content4-tracked
738 warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
738 file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
739 file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
739 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
740 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
740 What do you want to do? u
741 What do you want to do? u
@@ -752,6 +753,7 b' Re-resolve and check status'
752 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
753 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
753 What do you want to do? u
754 What do you want to do? u
754 merging content1_content2_content2_content4-tracked
755 merging content1_content2_content2_content4-tracked
756 warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
755 file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
757 file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
756 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
758 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
757 What do you want to do? u
759 What do you want to do? u
@@ -769,10 +771,12 b' Re-resolve and check status'
769 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
771 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
770 What do you want to do? u
772 What do you want to do? u
771 merging content1_content2_content3_content3-tracked
773 merging content1_content2_content3_content3-tracked
774 warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
772 file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
775 file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
773 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
776 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
774 What do you want to do? u
777 What do you want to do? u
775 merging content1_content2_content3_content4-tracked
778 merging content1_content2_content3_content4-tracked
779 warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
776 file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
780 file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
777 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
781 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
778 What do you want to do? u
782 What do you want to do? u
@@ -790,6 +794,7 b' Re-resolve and check status'
790 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
794 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
791 What do you want to do? u
795 What do you want to do? u
792 merging content1_content2_missing_content4-tracked
796 merging content1_content2_missing_content4-tracked
797 warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
793 file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
798 file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
794 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
799 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
795 What do you want to do? u
800 What do you want to do? u
@@ -812,19 +817,14 b' Re-resolve and check status'
812 You can use (c)hanged version, (d)elete, or leave (u)nresolved.
817 You can use (c)hanged version, (d)elete, or leave (u)nresolved.
813 What do you want to do? u
818 What do you want to do? u
814 merging missing_content2_content2_content4-tracked
819 merging missing_content2_content2_content4-tracked
820 warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
815 merging missing_content2_content3_content3-tracked
821 merging missing_content2_content3_content3-tracked
822 warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
816 merging missing_content2_content3_content4-tracked
823 merging missing_content2_content3_content4-tracked
824 warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
817 merging missing_content2_missing_content4-tracked
825 merging missing_content2_missing_content4-tracked
826 warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
818 merging missing_content2_missing_content4-untracked
827 merging missing_content2_missing_content4-untracked
819 warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
820 warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
821 warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
822 warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
823 warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
824 warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
825 warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
826 warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
827 warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
828 warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
828 warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
829 [1]
829 [1]
830 $ checkstatus > $TESTTMP/status2 2>&1
830 $ checkstatus > $TESTTMP/status2 2>&1
@@ -24,8 +24,8 b' Testing on-failure=continue'
24 $ hg rebase -s 1 -d 2 --tool false
24 $ hg rebase -s 1 -d 2 --tool false
25 rebasing 1:1f28a51c3c9b "c"
25 rebasing 1:1f28a51c3c9b "c"
26 merging a
26 merging a
27 merging a failed!
27 merging b
28 merging b
28 merging a failed!
29 merging b failed!
29 merging b failed!
30 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
30 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
31 [240]
31 [240]
@@ -42,7 +42,6 b' Testing on-failure=halt'
42 $ hg rebase -s 1 -d 2 --tool false
42 $ hg rebase -s 1 -d 2 --tool false
43 rebasing 1:1f28a51c3c9b "c"
43 rebasing 1:1f28a51c3c9b "c"
44 merging a
44 merging a
45 merging b
46 merging a failed!
45 merging a failed!
47 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
46 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
48 [240]
47 [240]
@@ -67,9 +66,9 b' Testing on-failure=prompt'
67 > EOS
66 > EOS
68 rebasing 1:1f28a51c3c9b "c"
67 rebasing 1:1f28a51c3c9b "c"
69 merging a
68 merging a
70 merging b
71 merging a failed!
69 merging a failed!
72 continue merge operation (yn)? y
70 continue merge operation (yn)? y
71 merging b
73 merging b failed!
72 merging b failed!
74 continue merge operation (yn)? n
73 continue merge operation (yn)? n
75 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
74 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -94,9 +93,9 b' Check that successful tool with failed p'
94 > EOS
93 > EOS
95 rebasing 1:1f28a51c3c9b "c"
94 rebasing 1:1f28a51c3c9b "c"
96 merging a
95 merging a
97 merging b
98 output file a appears unchanged
96 output file a appears unchanged
99 was merge successful (yn)? y
97 was merge successful (yn)? y
98 merging b
100 output file b appears unchanged
99 output file b appears unchanged
101 was merge successful (yn)? n
100 was merge successful (yn)? n
102 merging b failed!
101 merging b failed!
@@ -122,7 +121,6 b' Check that conflicts with conflict check'
122 $ hg rebase -s 1 -d 2 --tool true
121 $ hg rebase -s 1 -d 2 --tool true
123 rebasing 1:1f28a51c3c9b "c"
122 rebasing 1:1f28a51c3c9b "c"
124 merging a
123 merging a
125 merging b
126 merging a failed!
124 merging a failed!
127 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
125 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
128 [240]
126 [240]
@@ -141,8 +139,8 b' Check that always-prompt also can halt t'
141 > EOS
139 > EOS
142 rebasing 1:1f28a51c3c9b "c"
140 rebasing 1:1f28a51c3c9b "c"
143 merging a
141 merging a
142 was merge of 'a' successful (yn)? y
144 merging b
143 merging b
145 was merge of 'a' successful (yn)? y
146 was merge of 'b' successful (yn)? n
144 was merge of 'b' successful (yn)? n
147 merging b failed!
145 merging b failed!
148 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
146 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
@@ -159,8 +157,8 b' Check that successful tool otherwise all'
159 $ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep
157 $ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep
160 rebasing 1:1f28a51c3c9b "c"
158 rebasing 1:1f28a51c3c9b "c"
161 merging a
159 merging a
160 $TESTTMP/repo/a *a~base* *a~other* (glob)
162 merging b
161 merging b
163 $TESTTMP/repo/a *a~base* *a~other* (glob)
164 $TESTTMP/repo/b *b~base* *b~other* (glob)
162 $TESTTMP/repo/b *b~base* *b~other* (glob)
165
163
166 Check that unshelve isn't broken by halting the merge
164 Check that unshelve isn't broken by halting the merge
@@ -187,7 +185,6 b" Check that unshelve isn't broken by halt"
187 unshelving change 'default'
185 unshelving change 'default'
188 rebasing shelved changes
186 rebasing shelved changes
189 merging shelve_file1
187 merging shelve_file1
190 merging shelve_file2
191 merging shelve_file1 failed!
188 merging shelve_file1 failed!
192 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
189 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
193 [240]
190 [240]
@@ -195,7 +192,6 b" Check that unshelve isn't broken by halt"
195 M shelve_file1
192 M shelve_file1
196 M shelve_file2
193 M shelve_file2
197 ? shelve_file1.orig
194 ? shelve_file1.orig
198 ? shelve_file2.orig
199 # The repository is in an unfinished *unshelve* state.
195 # The repository is in an unfinished *unshelve* state.
200
196
201 # Unresolved merge conflicts:
197 # Unresolved merge conflicts:
@@ -210,7 +206,6 b" Check that unshelve isn't broken by halt"
210
206
211 $ hg resolve --tool false --all --re-merge
207 $ hg resolve --tool false --all --re-merge
212 merging shelve_file1
208 merging shelve_file1
213 merging shelve_file2
214 merging shelve_file1 failed!
209 merging shelve_file1 failed!
215 merge halted after failed merge (see hg resolve)
210 merge halted after failed merge (see hg resolve)
216 [240]
211 [240]
@@ -34,7 +34,7 b' Symlink is local parent, executable is o'
34 branchmerge: True, force: False, partial: False
34 branchmerge: True, force: False, partial: False
35 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c
35 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c
36 preserving a for resolve of a
36 preserving a for resolve of a
37 a: versions differ -> m (premerge)
37 a: versions differ -> m
38 tool internal:merge (for pattern a) can't handle symlinks
38 tool internal:merge (for pattern a) can't handle symlinks
39 couldn't find merge tool hgmerge
39 couldn't find merge tool hgmerge
40 no tool found to merge a
40 no tool found to merge a
@@ -68,7 +68,7 b' Symlink is other parent, executable is l'
68 branchmerge: True, force: False, partial: False
68 branchmerge: True, force: False, partial: False
69 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
69 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
70 preserving a for resolve of a
70 preserving a for resolve of a
71 a: versions differ -> m (premerge)
71 a: versions differ -> m
72 picked tool ':union' for a (binary False symlink True changedelete False)
72 picked tool ':union' for a (binary False symlink True changedelete False)
73 merging a
73 merging a
74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
@@ -90,7 +90,7 b' Symlink is other parent, executable is l'
90 branchmerge: True, force: False, partial: False
90 branchmerge: True, force: False, partial: False
91 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
91 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
92 preserving a for resolve of a
92 preserving a for resolve of a
93 a: versions differ -> m (premerge)
93 a: versions differ -> m
94 picked tool ':merge3' for a (binary False symlink True changedelete False)
94 picked tool ':merge3' for a (binary False symlink True changedelete False)
95 merging a
95 merging a
96 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
96 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
@@ -112,7 +112,7 b' Symlink is other parent, executable is l'
112 branchmerge: True, force: False, partial: False
112 branchmerge: True, force: False, partial: False
113 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
113 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
114 preserving a for resolve of a
114 preserving a for resolve of a
115 a: versions differ -> m (premerge)
115 a: versions differ -> m
116 picked tool ':merge-local' for a (binary False symlink True changedelete False)
116 picked tool ':merge-local' for a (binary False symlink True changedelete False)
117 merging a
117 merging a
118 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
118 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
@@ -133,7 +133,7 b' Symlink is other parent, executable is l'
133 branchmerge: True, force: False, partial: False
133 branchmerge: True, force: False, partial: False
134 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
134 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f
135 preserving a for resolve of a
135 preserving a for resolve of a
136 a: versions differ -> m (premerge)
136 a: versions differ -> m
137 picked tool ':merge-other' for a (binary False symlink True changedelete False)
137 picked tool ':merge-other' for a (binary False symlink True changedelete False)
138 merging a
138 merging a
139 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
139 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da
@@ -166,7 +166,7 b' Update to link with local change should '
166 branchmerge: False, force: False, partial: False
166 branchmerge: False, force: False, partial: False
167 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
167 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
168 preserving a for resolve of a
168 preserving a for resolve of a
169 a: versions differ -> m (premerge)
169 a: versions differ -> m
170 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
170 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
171 no tool found to merge a
171 no tool found to merge a
172 picked tool ':prompt' for a (binary False symlink True changedelete False)
172 picked tool ':prompt' for a (binary False symlink True changedelete False)
@@ -343,9 +343,12 b' h: l vs l, different'
343
343
344 $ hg merge
344 $ hg merge
345 merging a
345 merging a
346 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
346 warning: cannot merge flags for b without common ancestor - keeping local flags
347 warning: cannot merge flags for b without common ancestor - keeping local flags
347 merging b
348 merging b
349 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
348 merging bx
350 merging bx
351 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
349 warning: cannot merge flags for c without common ancestor - keeping local flags
352 warning: cannot merge flags for c without common ancestor - keeping local flags
350 tool internal:merge (for pattern d) can't handle symlinks
353 tool internal:merge (for pattern d) can't handle symlinks
351 no tool found to merge d
354 no tool found to merge d
@@ -362,9 +365,6 b' h: l vs l, different'
362 file 'h' needs to be resolved.
365 file 'h' needs to be resolved.
363 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
366 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
364 What do you want to do? u
367 What do you want to do? u
365 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
366 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
367 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
368 3 files updated, 0 files merged, 0 files removed, 6 files unresolved
368 3 files updated, 0 files merged, 0 files removed, 6 files unresolved
369 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
369 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
370 [1]
370 [1]
@@ -411,9 +411,12 b' h: l vs l, different'
411 $ hg up -Cqr1
411 $ hg up -Cqr1
412 $ hg merge
412 $ hg merge
413 merging a
413 merging a
414 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
414 warning: cannot merge flags for b without common ancestor - keeping local flags
415 warning: cannot merge flags for b without common ancestor - keeping local flags
415 merging b
416 merging b
417 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
416 merging bx
418 merging bx
419 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
417 warning: cannot merge flags for c without common ancestor - keeping local flags
420 warning: cannot merge flags for c without common ancestor - keeping local flags
418 tool internal:merge (for pattern d) can't handle symlinks
421 tool internal:merge (for pattern d) can't handle symlinks
419 no tool found to merge d
422 no tool found to merge d
@@ -430,9 +433,6 b' h: l vs l, different'
430 file 'h' needs to be resolved.
433 file 'h' needs to be resolved.
431 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
434 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
432 What do you want to do? u
435 What do you want to do? u
433 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
434 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
435 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
436 3 files updated, 0 files merged, 0 files removed, 6 files unresolved
436 3 files updated, 0 files merged, 0 files removed, 6 files unresolved
437 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
437 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
438 [1]
438 [1]
@@ -86,11 +86,10 b' pull and merge from test-a again'
86 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
86 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
87 starting 4 threads for background file closing (?)
87 starting 4 threads for background file closing (?)
88 preserving test.txt for resolve of test.txt
88 preserving test.txt for resolve of test.txt
89 test.txt: versions differ -> m (premerge)
89 test.txt: versions differ -> m
90 picked tool ':merge' for test.txt (binary False symlink False changedelete False)
90 picked tool ':merge' for test.txt (binary False symlink False changedelete False)
91 merging test.txt
91 merging test.txt
92 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
92 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
93 test.txt: versions differ -> m (merge)
94 picked tool ':merge' for test.txt (binary False symlink False changedelete False)
93 picked tool ':merge' for test.txt (binary False symlink False changedelete False)
95 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
94 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
96 warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')
95 warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')
@@ -27,8 +27,8 b' a file-level merge failed'
27 test with the rename on the remote side
27 test with the rename on the remote side
28 $ HGMERGE=false hg merge
28 $ HGMERGE=false hg merge
29 merging bar
29 merging bar
30 merging bar failed!
30 merging foo and baz to baz
31 merging foo and baz to baz
31 merging bar failed!
32 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
32 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
33 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
33 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
34 [1]
34 [1]
@@ -41,8 +41,8 b' test with the rename on the local side'
41 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
41 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
42 $ HGMERGE=false hg merge
42 $ HGMERGE=false hg merge
43 merging bar
43 merging bar
44 merging bar failed!
44 merging baz and foo to baz
45 merging baz and foo to baz
45 merging bar failed!
46 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
46 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
47 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
47 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
48 [1]
48 [1]
@@ -44,7 +44,7 b''
44 getting b2
44 getting b2
45 preserving a for resolve of b
45 preserving a for resolve of b
46 removing a
46 removing a
47 b: remote moved from a -> m (premerge)
47 b: remote moved from a -> m
48 picked tool ':merge' for b (binary False symlink False changedelete False)
48 picked tool ':merge' for b (binary False symlink False changedelete False)
49 merging a and b to b
49 merging a and b to b
50 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
50 my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c
@@ -218,7 +218,7 b' modify x and rename y to z on the other '
218 ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
218 ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
219 starting 4 threads for background file closing (?)
219 starting 4 threads for background file closing (?)
220 preserving z for resolve of z
220 preserving z for resolve of z
221 z: both renamed from y -> m (premerge)
221 z: both renamed from y -> m
222 picked tool ':merge3' for z (binary False symlink False changedelete False)
222 picked tool ':merge3' for z (binary False symlink False changedelete False)
223 merging z
223 merging z
224 my z@07fcbc9a74ed+ other z@f21419739508 ancestor y@5151c134577e
224 my z@07fcbc9a74ed+ other z@f21419739508 ancestor y@5151c134577e
@@ -88,16 +88,15 b' args:'
88 starting 4 threads for background file closing (?)
88 starting 4 threads for background file closing (?)
89 preserving a for resolve of b
89 preserving a for resolve of b
90 preserving rev for resolve of rev
90 preserving rev for resolve of rev
91 b: remote copied from a -> m (premerge)
91 b: remote copied from a -> m
92 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
92 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
93 merging a and b to b
93 merging a and b to b
94 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
94 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
95 premerge successful
95 premerge successful
96 rev: versions differ -> m (premerge)
96 rev: versions differ -> m
97 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
97 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
98 merging rev
98 merging rev
99 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
99 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
100 rev: versions differ -> m (merge)
101 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
100 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
102 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
101 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
103 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
102 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -128,16 +127,15 b' args:'
128 getting a
127 getting a
129 preserving b for resolve of b
128 preserving b for resolve of b
130 preserving rev for resolve of rev
129 preserving rev for resolve of rev
131 b: local copied/moved from a -> m (premerge)
130 b: local copied/moved from a -> m
132 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
131 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
133 merging b and a to b
132 merging b and a to b
134 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337
133 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337
135 premerge successful
134 premerge successful
136 rev: versions differ -> m (premerge)
135 rev: versions differ -> m
137 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
136 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
138 merging rev
137 merging rev
139 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
138 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
140 rev: versions differ -> m (merge)
141 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
139 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
142 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
140 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
143 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
141 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -168,16 +166,15 b' args:'
168 preserving a for resolve of b
166 preserving a for resolve of b
169 preserving rev for resolve of rev
167 preserving rev for resolve of rev
170 removing a
168 removing a
171 b: remote moved from a -> m (premerge)
169 b: remote moved from a -> m
172 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
170 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
173 merging a and b to b
171 merging a and b to b
174 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
172 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
175 premerge successful
173 premerge successful
176 rev: versions differ -> m (premerge)
174 rev: versions differ -> m
177 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
175 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
178 merging rev
176 merging rev
179 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
177 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
180 rev: versions differ -> m (merge)
181 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
178 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
182 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
179 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
183 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
180 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -206,16 +203,15 b' args:'
206 starting 4 threads for background file closing (?)
203 starting 4 threads for background file closing (?)
207 preserving b for resolve of b
204 preserving b for resolve of b
208 preserving rev for resolve of rev
205 preserving rev for resolve of rev
209 b: local copied/moved from a -> m (premerge)
206 b: local copied/moved from a -> m
210 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
207 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
211 merging b and a to b
208 merging b and a to b
212 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
209 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
213 premerge successful
210 premerge successful
214 rev: versions differ -> m (premerge)
211 rev: versions differ -> m
215 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
212 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
216 merging rev
213 merging rev
217 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
214 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
218 rev: versions differ -> m (merge)
219 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
215 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
220 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
216 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
221 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
217 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -244,11 +240,10 b' args:'
244 b: remote created -> g
240 b: remote created -> g
245 getting b
241 getting b
246 preserving rev for resolve of rev
242 preserving rev for resolve of rev
247 rev: versions differ -> m (premerge)
243 rev: versions differ -> m
248 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
244 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
249 merging rev
245 merging rev
250 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
246 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
251 rev: versions differ -> m (merge)
252 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
247 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
253 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
248 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
254 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
249 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -276,11 +271,10 b' args:'
276 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
271 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
277 starting 4 threads for background file closing (?)
272 starting 4 threads for background file closing (?)
278 preserving rev for resolve of rev
273 preserving rev for resolve of rev
279 rev: versions differ -> m (premerge)
274 rev: versions differ -> m
280 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
275 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
281 merging rev
276 merging rev
282 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
277 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
283 rev: versions differ -> m (merge)
284 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
278 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
285 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
279 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
286 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
280 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -311,11 +305,10 b' args:'
311 b: remote created -> g
305 b: remote created -> g
312 getting b
306 getting b
313 preserving rev for resolve of rev
307 preserving rev for resolve of rev
314 rev: versions differ -> m (premerge)
308 rev: versions differ -> m
315 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
309 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
316 merging rev
310 merging rev
317 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
311 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
318 rev: versions differ -> m (merge)
319 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
312 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
320 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
313 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
321 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
314 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -342,11 +335,10 b' args:'
342 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
335 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
343 starting 4 threads for background file closing (?)
336 starting 4 threads for background file closing (?)
344 preserving rev for resolve of rev
337 preserving rev for resolve of rev
345 rev: versions differ -> m (premerge)
338 rev: versions differ -> m
346 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
339 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
347 merging rev
340 merging rev
348 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
341 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
349 rev: versions differ -> m (merge)
350 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
342 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
351 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
343 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
352 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
344 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -374,20 +366,18 b' args:'
374 starting 4 threads for background file closing (?)
366 starting 4 threads for background file closing (?)
375 preserving b for resolve of b
367 preserving b for resolve of b
376 preserving rev for resolve of rev
368 preserving rev for resolve of rev
377 b: both renamed from a -> m (premerge)
369 b: both renamed from a -> m
378 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
370 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
379 merging b
371 merging b
380 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
372 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
381 rev: versions differ -> m (premerge)
382 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
383 merging rev
384 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
385 b: both renamed from a -> m (merge)
386 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
373 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
387 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
374 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
388 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
375 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
389 merge tool returned: 0
376 merge tool returned: 0
390 rev: versions differ -> m (merge)
377 rev: versions differ -> m
378 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
379 merging rev
380 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
391 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
381 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
392 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
382 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
393 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
383 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -425,11 +415,10 b' m "um a c" "um x c" " " "10 do merg'
425 c: remote created -> g
415 c: remote created -> g
426 getting c
416 getting c
427 preserving rev for resolve of rev
417 preserving rev for resolve of rev
428 rev: versions differ -> m (premerge)
418 rev: versions differ -> m
429 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
419 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
430 merging rev
420 merging rev
431 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
421 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
432 rev: versions differ -> m (merge)
433 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
422 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
434 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
423 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
435 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
424 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -456,20 +445,18 b' m "um a c" "um x c" " " "10 do merg'
456 starting 4 threads for background file closing (?)
445 starting 4 threads for background file closing (?)
457 preserving b for resolve of b
446 preserving b for resolve of b
458 preserving rev for resolve of rev
447 preserving rev for resolve of rev
459 b: both created -> m (premerge)
448 b: both created -> m
460 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
449 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
461 merging b
450 merging b
462 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
451 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
463 rev: versions differ -> m (premerge)
464 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
465 merging rev
466 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
467 b: both created -> m (merge)
468 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
452 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
469 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
453 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
470 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
454 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
471 merge tool returned: 0
455 merge tool returned: 0
472 rev: versions differ -> m (merge)
456 rev: versions differ -> m
457 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
458 merging rev
459 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
473 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
460 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
474 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
461 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
475 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
462 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -498,20 +485,18 b' m "um a c" "um x c" " " "10 do merg'
498 starting 4 threads for background file closing (?)
485 starting 4 threads for background file closing (?)
499 preserving b for resolve of b
486 preserving b for resolve of b
500 preserving rev for resolve of rev
487 preserving rev for resolve of rev
501 b: both created -> m (premerge)
488 b: both created -> m
502 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
489 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
503 merging b
490 merging b
504 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
491 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
505 rev: versions differ -> m (premerge)
506 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
507 merging rev
508 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
509 b: both created -> m (merge)
510 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
492 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
511 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
493 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
512 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
494 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
513 merge tool returned: 0
495 merge tool returned: 0
514 rev: versions differ -> m (merge)
496 rev: versions differ -> m
497 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
498 merging rev
499 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
515 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
500 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
516 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
501 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
517 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
502 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -538,16 +523,15 b' m "um a c" "um x c" " " "10 do merg'
538 getting a
523 getting a
539 preserving b for resolve of b
524 preserving b for resolve of b
540 preserving rev for resolve of rev
525 preserving rev for resolve of rev
541 b: both renamed from a -> m (premerge)
526 b: both renamed from a -> m
542 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
527 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
543 merging b
528 merging b
544 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337
529 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337
545 premerge successful
530 premerge successful
546 rev: versions differ -> m (premerge)
531 rev: versions differ -> m
547 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
532 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
548 merging rev
533 merging rev
549 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
534 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
550 rev: versions differ -> m (merge)
551 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
535 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
552 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
536 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
553 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
537 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -576,20 +560,18 b' m "um a c" "um x c" " " "10 do merg'
576 starting 4 threads for background file closing (?)
560 starting 4 threads for background file closing (?)
577 preserving b for resolve of b
561 preserving b for resolve of b
578 preserving rev for resolve of rev
562 preserving rev for resolve of rev
579 b: both created -> m (premerge)
563 b: both created -> m
580 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
564 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
581 merging b
565 merging b
582 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
566 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
583 rev: versions differ -> m (premerge)
584 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
585 merging rev
586 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
587 b: both created -> m (merge)
588 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
567 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
589 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
568 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
590 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
569 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
591 merge tool returned: 0
570 merge tool returned: 0
592 rev: versions differ -> m (merge)
571 rev: versions differ -> m
572 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
573 merging rev
574 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
593 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
575 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
594 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
576 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
595 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
577 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -616,16 +598,15 b' m "um a c" "um x c" " " "10 do merg'
616 getting a
598 getting a
617 preserving b for resolve of b
599 preserving b for resolve of b
618 preserving rev for resolve of rev
600 preserving rev for resolve of rev
619 b: both renamed from a -> m (premerge)
601 b: both renamed from a -> m
620 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
602 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
621 merging b
603 merging b
622 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337
604 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337
623 premerge successful
605 premerge successful
624 rev: versions differ -> m (premerge)
606 rev: versions differ -> m
625 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
607 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
626 merging rev
608 merging rev
627 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
609 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
628 rev: versions differ -> m (merge)
629 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
610 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
630 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
611 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
631 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
612 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -652,16 +633,15 b' m "um a c" "um x c" " " "10 do merg'
652 starting 4 threads for background file closing (?)
633 starting 4 threads for background file closing (?)
653 preserving b for resolve of b
634 preserving b for resolve of b
654 preserving rev for resolve of rev
635 preserving rev for resolve of rev
655 b: both renamed from a -> m (premerge)
636 b: both renamed from a -> m
656 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
637 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
657 merging b
638 merging b
658 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337
639 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337
659 premerge successful
640 premerge successful
660 rev: versions differ -> m (premerge)
641 rev: versions differ -> m
661 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
642 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
662 merging rev
643 merging rev
663 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
644 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
664 rev: versions differ -> m (merge)
665 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
645 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
666 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
646 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
667 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
647 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -688,16 +668,15 b' m "um a c" "um x c" " " "10 do merg'
688 starting 4 threads for background file closing (?)
668 starting 4 threads for background file closing (?)
689 preserving b for resolve of b
669 preserving b for resolve of b
690 preserving rev for resolve of rev
670 preserving rev for resolve of rev
691 b: both renamed from a -> m (premerge)
671 b: both renamed from a -> m
692 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
672 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
693 merging b
673 merging b
694 my b@02963e448370+ other b@8dbce441892a ancestor a@924404dff337
674 my b@02963e448370+ other b@8dbce441892a ancestor a@924404dff337
695 premerge successful
675 premerge successful
696 rev: versions differ -> m (premerge)
676 rev: versions differ -> m
697 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
677 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
698 merging rev
678 merging rev
699 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
679 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
700 rev: versions differ -> m (merge)
701 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
680 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
702 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
681 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
703 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
682 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -723,16 +702,15 b' m "um a c" "um x c" " " "10 do merg'
723 starting 4 threads for background file closing (?)
702 starting 4 threads for background file closing (?)
724 preserving b for resolve of b
703 preserving b for resolve of b
725 preserving rev for resolve of rev
704 preserving rev for resolve of rev
726 b: both renamed from a -> m (premerge)
705 b: both renamed from a -> m
727 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
706 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
728 merging b
707 merging b
729 my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337
708 my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337
730 premerge successful
709 premerge successful
731 rev: versions differ -> m (premerge)
710 rev: versions differ -> m
732 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
711 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
733 merging rev
712 merging rev
734 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
713 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
735 rev: versions differ -> m (merge)
736 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
714 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
737 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
715 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
738 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
716 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -762,20 +740,18 b' m "um a c" "um x c" " " "10 do merg'
762 preserving a for resolve of b
740 preserving a for resolve of b
763 preserving rev for resolve of rev
741 preserving rev for resolve of rev
764 removing a
742 removing a
765 b: remote moved from a -> m (premerge)
743 b: remote moved from a -> m
766 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
744 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
767 merging a and b to b
745 merging a and b to b
768 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
746 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
769 rev: versions differ -> m (premerge)
770 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
771 merging rev
772 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
773 b: remote moved from a -> m (merge)
774 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
747 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
775 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
748 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
776 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
749 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
777 merge tool returned: 0
750 merge tool returned: 0
778 rev: versions differ -> m (merge)
751 rev: versions differ -> m
752 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
753 merging rev
754 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
779 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
755 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
780 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
756 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
781 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
757 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -804,20 +780,18 b' m "um a c" "um x c" " " "10 do merg'
804 starting 4 threads for background file closing (?)
780 starting 4 threads for background file closing (?)
805 preserving b for resolve of b
781 preserving b for resolve of b
806 preserving rev for resolve of rev
782 preserving rev for resolve of rev
807 b: local copied/moved from a -> m (premerge)
783 b: local copied/moved from a -> m
808 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
784 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
809 merging b and a to b
785 merging b and a to b
810 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
786 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
811 rev: versions differ -> m (premerge)
812 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
813 merging rev
814 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
815 b: local copied/moved from a -> m (merge)
816 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
787 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
817 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
788 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
818 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
789 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
819 merge tool returned: 0
790 merge tool returned: 0
820 rev: versions differ -> m (merge)
791 rev: versions differ -> m
792 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
793 merging rev
794 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
821 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
795 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
822 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
796 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
823 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
797 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -852,16 +826,15 b' m "nm a b" "um x a" " " "22 get a, '
852 getting c
826 getting c
853 preserving b for resolve of b
827 preserving b for resolve of b
854 preserving rev for resolve of rev
828 preserving rev for resolve of rev
855 b: local copied/moved from a -> m (premerge)
829 b: local copied/moved from a -> m
856 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
830 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
857 merging b and a to b
831 merging b and a to b
858 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
832 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
859 premerge successful
833 premerge successful
860 rev: versions differ -> m (premerge)
834 rev: versions differ -> m
861 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
835 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
862 merging rev
836 merging rev
863 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
837 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
864 rev: versions differ -> m (merge)
865 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
838 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
866 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
839 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
867 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
840 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
@@ -196,8 +196,8 b' resolve without arguments should suggest'
196 resolve --all should re-merge all unresolved files
196 resolve --all should re-merge all unresolved files
197 $ hg resolve --all
197 $ hg resolve --all
198 merging file1
198 merging file1
199 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
199 merging file2
200 merging file2
200 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
201 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
201 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
202 [1]
202 [1]
203 $ cat file1.orig
203 $ cat file1.orig
@@ -211,8 +211,8 b' resolve --all should re-merge all unreso'
211 $ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
211 $ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups'
212 merging file1
212 merging file1
213 creating directory: $TESTTMP/repo/.hg/origbackups
213 creating directory: $TESTTMP/repo/.hg/origbackups
214 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
214 merging file2
215 merging file2
215 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
216 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
216 warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
217 [1]
217 [1]
218 $ ls .hg/origbackups
218 $ ls .hg/origbackups
@@ -478,10 +478,10 b" Test 'hg resolve' confirm config option "
478 $ hg rebase -s 1 -d 2
478 $ hg rebase -s 1 -d 2
479 rebasing 1:f30f98a8181f "added emp1 emp2 emp3"
479 rebasing 1:f30f98a8181f "added emp1 emp2 emp3"
480 merging emp1
480 merging emp1
481 warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
481 merging emp2
482 merging emp2
483 warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
482 merging emp3
484 merging emp3
483 warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
484 warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
485 warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
485 warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
486 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
486 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
487 [240]
487 [240]
@@ -490,10 +490,10 b' Test when commands.resolve.confirm confi'
490 ===========================================================
490 ===========================================================
491 $ hg resolve --all
491 $ hg resolve --all
492 merging emp1
492 merging emp1
493 warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
493 merging emp2
494 merging emp2
495 warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
494 merging emp3
496 merging emp3
495 warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
496 warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
497 warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
497 warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
498 [1]
498 [1]
499
499
@@ -522,10 +522,10 b' Test when config option is set:'
522 > EOF
522 > EOF
523 re-merge all unresolved files (yn)? y
523 re-merge all unresolved files (yn)? y
524 merging emp1
524 merging emp1
525 warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
525 merging emp2
526 merging emp2
527 warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
526 merging emp3
528 merging emp3
527 warning: conflicts while merging emp1! (edit, then use 'hg resolve --mark')
528 warning: conflicts while merging emp2! (edit, then use 'hg resolve --mark')
529 warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
529 warning: conflicts while merging emp3! (edit, then use 'hg resolve --mark')
530 [1]
530 [1]
531
531
@@ -1385,8 +1385,8 b' Abort unshelve while merging (issue5123)'
1385 unshelving change 'default-01'
1385 unshelving change 'default-01'
1386 rebasing shelved changes
1386 rebasing shelved changes
1387 merging bar1
1387 merging bar1
1388 warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark')
1388 merging bar2
1389 merging bar2
1389 warning: conflicts while merging bar1! (edit, then use 'hg resolve --mark')
1390 warning: conflicts while merging bar2! (edit, then use 'hg resolve --mark')
1390 warning: conflicts while merging bar2! (edit, then use 'hg resolve --mark')
1391 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
1391 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
1392 [240]
1392 [240]
@@ -128,8 +128,8 b' Verify conflicting merge pulls in the co'
128 $ hg merge 1
128 $ hg merge 1
129 temporarily included 2 file(s) in the sparse checkout for merging
129 temporarily included 2 file(s) in the sparse checkout for merging
130 merging backend.sparse
130 merging backend.sparse
131 warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
131 merging data.py
132 merging data.py
132 warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
133 warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')
133 warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')
134 0 files updated, 0 files merged, 0 files removed, 2 files unresolved
134 0 files updated, 0 files merged, 0 files removed, 2 files unresolved
135 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
135 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
@@ -197,8 +197,8 b' Verify rebase conflicts pulls in the con'
197 rebasing 1:a2b1de640a62 "edit profile"
197 rebasing 1:a2b1de640a62 "edit profile"
198 temporarily included 2 file(s) in the sparse checkout for merging
198 temporarily included 2 file(s) in the sparse checkout for merging
199 merging backend.sparse
199 merging backend.sparse
200 warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
200 merging data.py
201 merging data.py
201 warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark')
202 warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')
202 warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark')
203 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
203 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
204 [240]
204 [240]
@@ -375,8 +375,8 b" test 'resolve -l'"
375 created new head
375 created new head
376 $ hg merge
376 $ hg merge
377 merging a
377 merging a
378 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
378 merging b
379 merging b
379 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
380 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
380 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
381 0 files updated, 0 files merged, 0 files removed, 2 files unresolved
381 0 files updated, 0 files merged, 0 files removed, 2 files unresolved
382 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
382 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
@@ -278,7 +278,7 b' merge tests'
278 branchmerge: True, force: False, partial: False
278 branchmerge: True, force: False, partial: False
279 ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4
279 ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4
280 starting 4 threads for background file closing (?)
280 starting 4 threads for background file closing (?)
281 .hgsubstate: versions differ -> m (premerge)
281 .hgsubstate: versions differ -> m
282 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
282 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
283 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
283 subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
284 getting subrepo t
284 getting subrepo t
@@ -304,7 +304,7 b' merge tests'
304 branchmerge: True, force: False, partial: False
304 branchmerge: True, force: False, partial: False
305 ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf
305 ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf
306 starting 4 threads for background file closing (?)
306 starting 4 threads for background file closing (?)
307 .hgsubstate: versions differ -> m (premerge)
307 .hgsubstate: versions differ -> m
308 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
308 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
309 subrepo t: both sides changed
309 subrepo t: both sides changed
310 subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)
310 subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)
@@ -317,11 +317,10 b' merge tests'
317 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
317 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
318 starting 4 threads for background file closing (?)
318 starting 4 threads for background file closing (?)
319 preserving t for resolve of t
319 preserving t for resolve of t
320 t: versions differ -> m (premerge)
320 t: versions differ -> m
321 picked tool ':merge' for t (binary False symlink False changedelete False)
321 picked tool ':merge' for t (binary False symlink False changedelete False)
322 merging t
322 merging t
323 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
323 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
324 t: versions differ -> m (merge)
325 picked tool ':merge' for t (binary False symlink False changedelete False)
324 picked tool ':merge' for t (binary False symlink False changedelete False)
326 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
325 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
327 warning: conflicts while merging t! (edit, then use 'hg resolve --mark')
326 warning: conflicts while merging t! (edit, then use 'hg resolve --mark')
@@ -46,11 +46,10 b''
46 b: remote created -> g
46 b: remote created -> g
47 getting b
47 getting b
48 preserving a for resolve of a
48 preserving a for resolve of a
49 a: versions differ -> m (premerge)
49 a: versions differ -> m
50 picked tool 'true' for a (binary False symlink False changedelete False)
50 picked tool 'true' for a (binary False symlink False changedelete False)
51 merging a
51 merging a
52 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
52 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
53 a: versions differ -> m (merge)
54 picked tool 'true' for a (binary False symlink False changedelete False)
53 picked tool 'true' for a (binary False symlink False changedelete False)
55 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
54 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
56 launching merge tool: true *$TESTTMP/r2/a* * * (glob)
55 launching merge tool: true *$TESTTMP/r2/a* * * (glob)
@@ -72,11 +71,10 b''
72 removing b
71 removing b
73 starting 4 threads for background file closing (?)
72 starting 4 threads for background file closing (?)
74 preserving a for resolve of a
73 preserving a for resolve of a
75 a: versions differ -> m (premerge)
74 a: versions differ -> m
76 picked tool 'true' for a (binary False symlink False changedelete False)
75 picked tool 'true' for a (binary False symlink False changedelete False)
77 merging a
76 merging a
78 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
77 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
79 a: versions differ -> m (merge)
80 picked tool 'true' for a (binary False symlink False changedelete False)
78 picked tool 'true' for a (binary False symlink False changedelete False)
81 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
79 my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
82 launching merge tool: true *$TESTTMP/r2/a* * * (glob)
80 launching merge tool: true *$TESTTMP/r2/a* * * (glob)
@@ -95,11 +93,10 b''
95 b: remote created -> g
93 b: remote created -> g
96 getting b
94 getting b
97 preserving a for resolve of a
95 preserving a for resolve of a
98 a: versions differ -> m (premerge)
96 a: versions differ -> m
99 picked tool 'true' for a (binary False symlink False changedelete False)
97 picked tool 'true' for a (binary False symlink False changedelete False)
100 merging a
98 merging a
101 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
99 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
102 a: versions differ -> m (merge)
103 picked tool 'true' for a (binary False symlink False changedelete False)
100 picked tool 'true' for a (binary False symlink False changedelete False)
104 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
101 my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
105 launching merge tool: true *$TESTTMP/r2/a* * * (glob)
102 launching merge tool: true *$TESTTMP/r2/a* * * (glob)
General Comments 0
You need to be logged in to leave comments. Login now