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