##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall -
r8753:af5f099d default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -125,15 +125,6 b' def manifestmerge(repo, p1, p2, pa, over'
125 125 partial = function to filter file lists
126 126 """
127 127
128 repo.ui.note(_("resolving manifests\n"))
129 repo.ui.debug(_(" overwrite %s partial %s\n") % (overwrite, bool(partial)))
130 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (pa, p1, p2))
131
132 action = []
133 copy, copied = {}, {}
134 m1 = p1.manifest()
135 m2 = p2.manifest()
136
137 128 def fmerge(f, f2, fa):
138 129 """merge flags"""
139 130 a, m, n = ma.flags(fa), m1.flags(f), m2.flags(f2)
@@ -155,17 +146,23 b' def manifestmerge(repo, p1, p2, pa, over'
155 146 repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
156 147 action.append((f, m) + args)
157 148
149 action, copy = [], {}
150
158 151 if overwrite:
159 ma = m1
160 elif p2 == pa: # backwards
161 ma = p1.p1().manifest()
162 else:
163 ma = pa.manifest()
164 if pa and repo.ui.configbool("merge", "followcopies", True):
152 pa = p1
153 elif pa == p2: # backwards
154 pa = p1.p1()
155 elif pa and repo.ui.configbool("merge", "followcopies", True):
165 156 dirs = repo.ui.configbool("merge", "followdirs", True)
166 157 copy, diverge = copies.copies(repo, p1, p2, pa, dirs)
167 158 for of, fl in diverge.iteritems():
168 159 act("divergent renames", "dr", of, fl)
160
161 repo.ui.note(_("resolving manifests\n"))
162 repo.ui.debug(_(" overwrite %s partial %s\n") % (overwrite, bool(partial)))
163 repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (pa, p1, p2))
164
165 m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest()
169 166 copied = set(copy.values())
170 167
171 168 # Compare manifests
Show file before | Show file after | Hide comments
@@ -1,7 +1,4 b''
1 1 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
2 resolving manifests
3 overwrite None partial False
4 ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0
5 2 searching for copies back to rev 1
6 3 unmatched files in other:
7 4 b
@@ -10,6 +7,9 b' resolving manifests'
10 7 c -> a *
11 8 b -> a *
12 9 checking for directory renames
10 resolving manifests
11 overwrite None partial False
12 ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0
13 13 a: remote moved to c -> m
14 14 a: remote moved to b -> m
15 15 preserving a for resolve of b
Show file before | Show file after | Hide comments
@@ -9,15 +9,15 b' user: test'
9 9 date: Mon Jan 12 13:46:40 1970 +0000
10 10 summary: cp foo bar; change both
11 11
12 resolving manifests
13 overwrite None partial False
14 ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9
15 12 searching for copies back to rev 1
16 13 unmatched files in other:
17 14 bar
18 15 all copies found (* = to merge, ! = divergent):
19 16 bar -> foo *
20 17 checking for directory renames
18 resolving manifests
19 overwrite None partial False
20 ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9
21 21 foo: versions differ -> m
22 22 foo: remote copied to bar -> m
23 23 preserving foo for resolve of bar
Show file before | Show file after | Hide comments
@@ -1,12 +1,12 b''
1 1 reverting foo
2 2 changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e
3 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 searching for copies back to rev 1
5 unmatched files in local:
6 bar
4 7 resolving manifests
5 8 overwrite None partial False
6 9 ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
7 searching for copies back to rev 1
8 unmatched files in local:
9 bar
10 10 foo: remote is newer -> g
11 11 getting foo
12 12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Show file before | Show file after | Hide comments
@@ -2,15 +2,15 b' adding 1'
2 2 adding 2
3 3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4 4 created new head
5 resolving manifests
6 overwrite None partial False
7 ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c
8 5 searching for copies back to rev 1
9 6 unmatched files in other:
10 7 1a
11 8 all copies found (* = to merge, ! = divergent):
12 9 1a -> 1
13 10 checking for directory renames
11 resolving manifests
12 overwrite None partial False
13 ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c
14 14 1: other deleted -> r
15 15 1a: remote created -> g
16 16 removing 1
@@ -20,15 +20,15 b' 1 files updated, 0 files merged, 1 files'
20 20 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
21 21 created new head
22 22 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
23 resolving manifests
24 overwrite None partial False
25 ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96
26 23 searching for copies back to rev 1
27 24 unmatched files in local:
28 25 1a
29 26 all copies found (* = to merge, ! = divergent):
30 27 1a -> 1 *
31 28 checking for directory renames
29 resolving manifests
30 overwrite None partial False
31 ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96
32 32 1a: local copied/moved to 1 -> m
33 33 preserving 1a for resolve of 1a
34 34 picked tool 'internal:merge' for 1a (binary False symlink False)
@@ -38,15 +38,15 b' my 1a@ac7575e3c052+ other 1@746e9549ea96'
38 38 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
39 39 (branch merge, don't forget to commit)
40 40 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
41 resolving manifests
42 overwrite None partial False
43 ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052
44 41 searching for copies back to rev 1
45 42 unmatched files in other:
46 43 1a
47 44 all copies found (* = to merge, ! = divergent):
48 45 1a -> 1 *
49 46 checking for directory renames
47 resolving manifests
48 overwrite None partial False
49 ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052
50 50 1: remote moved to 1a -> m
51 51 preserving 1 for resolve of 1a
52 52 removing 1
Show file before | Show file after | Hide comments
@@ -22,10 +22,10 b' 2:0a3ab4856510 0:2665aaee66e9'
22 22 1:5cd961e4045d
23 23 0:2665aaee66e9
24 24 % this should use bar@rev2 as the ancestor
25 searching for copies back to rev 1
25 26 resolving manifests
26 27 overwrite None partial False
27 28 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1
28 searching for copies back to rev 1
29 29 bar: versions differ -> m
30 30 preserving bar for resolve of bar
31 31 picked tool 'internal:merge' for bar (binary False symlink False)
@@ -72,10 +72,10 b' 2:0a3ab4856510 0:2665aaee66e9'
72 72 1:5cd961e4045d
73 73 0:2665aaee66e9
74 74 % this should use bar@rev2 as the ancestor
75 searching for copies back to rev 1
75 76 resolving manifests
76 77 overwrite None partial False
77 78 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897
78 searching for copies back to rev 1
79 79 bar: versions differ -> m
80 80 preserving bar for resolve of bar
81 81 picked tool 'internal:merge' for bar (binary False symlink False)
Show file before | Show file after | Hide comments
@@ -1,10 +1,10 b''
1 1 adding a
2 2 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3 3 created new head
4 searching for copies back to rev 1
4 5 resolving manifests
5 6 overwrite None partial False
6 7 ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
7 searching for copies back to rev 1
8 8 conflicting flags for a
9 9 (n)one, e(x)ec or sym(l)ink? n
10 10 a: update permissions -> e
@@ -13,10 +13,10 b' 0 files updated, 0 files merged, 0 files'
13 13 % symlink is local parent, executable is other
14 14 a has no flags (default for conflicts)
15 15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
16 searching for copies back to rev 1
16 17 resolving manifests
17 18 overwrite None partial False
18 19 ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
19 searching for copies back to rev 1
20 20 conflicting flags for a
21 21 (n)one, e(x)ec or sym(l)ink? n
22 22 a: remote is newer -> g
Show file before | Show file after | Hide comments
@@ -19,10 +19,10 b' adding manifests'
19 19 adding file changes
20 20 added 1 changesets with 1 changes to 1 files (+1 heads)
21 21 (run 'hg heads' to see heads, 'hg merge' to merge)
22 searching for copies back to rev 1
22 23 resolving manifests
23 24 overwrite None partial False
24 25 ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360
25 searching for copies back to rev 1
26 26 test.txt: versions differ -> m
27 27 preserving test.txt for resolve of test.txt
28 28 picked tool 'internal:merge' for test.txt (binary False symlink False)
Show file before | Show file after | Hide comments
@@ -5,9 +5,6 b' moving a/a to b/a'
5 5 moving a/b to b/b
6 6 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
7 7 created new head
8 resolving manifests
9 overwrite None partial False
10 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
11 8 searching for copies back to rev 1
12 9 unmatched files in local:
13 10 a/c
@@ -22,6 +19,9 b' resolving manifests'
22 19 dir a/ -> b/
23 20 file a/c -> b/c
24 21 file a/d -> b/d
22 resolving manifests
23 overwrite None partial False
24 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
25 25 a/d: remote renamed directory to b/d -> d
26 26 a/c: remote renamed directory to b/c -> d
27 27 a/b: other deleted -> r
@@ -47,9 +47,6 b' R a/c'
47 47 ? b/d
48 48 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
49 49 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
50 resolving manifests
51 overwrite None partial False
52 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
53 50 searching for copies back to rev 1
54 51 unmatched files in local:
55 52 b/a
@@ -63,6 +60,9 b' resolving manifests'
63 60 checking for directory renames
64 61 dir a/ -> b/
65 62 file a/c -> b/c
63 resolving manifests
64 overwrite None partial False
65 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
66 66 None: local renamed directory to b/c -> d
67 67 getting a/c to b/c
68 68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Show file before | Show file after | Hide comments
@@ -2,9 +2,6 b' checkout'
2 2 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
3 3 created new head
4 4 merge
5 resolving manifests
6 overwrite None partial False
7 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
8 5 searching for copies back to rev 1
9 6 unmatched files in local:
10 7 c2
@@ -17,6 +14,9 b' resolving manifests'
17 14 b2 -> a2 !
18 15 checking for directory renames
19 16 a2: divergent renames -> dr
17 resolving manifests
18 overwrite None partial False
19 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
20 20 a: remote moved to b -> m
21 21 b2: remote created -> g
22 22 preserving a for resolve of b
Show file before | Show file after | Hide comments
@@ -2,15 +2,15 b' created new head'
2 2 --------------
3 3 test L:up a R:nc a b W: - 1 get local a to b
4 4 --------------
5 resolving manifests
6 overwrite None partial False
7 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7
8 5 searching for copies back to rev 1
9 6 unmatched files in other:
10 7 b
11 8 all copies found (* = to merge, ! = divergent):
12 9 b -> a *
13 10 checking for directory renames
11 resolving manifests
12 overwrite None partial False
13 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7
14 14 rev: versions differ -> m
15 15 a: remote copied to b -> m
16 16 preserving a for resolve of b
@@ -34,15 +34,15 b' created new head'
34 34 --------------
35 35 test L:nc a b R:up a W: - 2 get rem change to a and b
36 36 --------------
37 resolving manifests
38 overwrite None partial False
39 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71
40 37 searching for copies back to rev 1
41 38 unmatched files in local:
42 39 b
43 40 all copies found (* = to merge, ! = divergent):
44 41 b -> a *
45 42 checking for directory renames
43 resolving manifests
44 overwrite None partial False
45 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71
46 46 a: remote is newer -> g
47 47 b: local copied/moved to a -> m
48 48 rev: versions differ -> m
@@ -68,15 +68,15 b' created new head'
68 68 --------------
69 69 test L:up a R:nm a b W: - 3 get local a change to b, remove a
70 70 --------------
71 resolving manifests
72 overwrite None partial False
73 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b
74 71 searching for copies back to rev 1
75 72 unmatched files in other:
76 73 b
77 74 all copies found (* = to merge, ! = divergent):
78 75 b -> a *
79 76 checking for directory renames
77 resolving manifests
78 overwrite None partial False
79 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b
80 80 rev: versions differ -> m
81 81 a: remote moved to b -> m
82 82 preserving a for resolve of b
@@ -100,15 +100,15 b' created new head'
100 100 --------------
101 101 test L:nm a b R:up a W: - 4 get remote change to b
102 102 --------------
103 resolving manifests
104 overwrite None partial False
105 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71
106 103 searching for copies back to rev 1
107 104 unmatched files in local:
108 105 b
109 106 all copies found (* = to merge, ! = divergent):
110 107 b -> a *
111 108 checking for directory renames
109 resolving manifests
110 overwrite None partial False
111 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71
112 112 b: local copied/moved to a -> m
113 113 rev: versions differ -> m
114 114 preserving b for resolve of b
@@ -131,15 +131,15 b' created new head'
131 131 --------------
132 132 test L: R:nc a b W: - 5 get b
133 133 --------------
134 resolving manifests
135 overwrite None partial False
136 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7
137 134 searching for copies back to rev 1
138 135 unmatched files in other:
139 136 b
140 137 all copies found (* = to merge, ! = divergent):
141 138 b -> a
142 139 checking for directory renames
140 resolving manifests
141 overwrite None partial False
142 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7
143 143 rev: versions differ -> m
144 144 b: remote created -> g
145 145 preserving rev for resolve of rev
@@ -158,15 +158,15 b' created new head'
158 158 --------------
159 159 test L:nc a b R: W: - 6 nothing
160 160 --------------
161 resolving manifests
162 overwrite None partial False
163 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336
164 161 searching for copies back to rev 1
165 162 unmatched files in local:
166 163 b
167 164 all copies found (* = to merge, ! = divergent):
168 165 b -> a
169 166 checking for directory renames
167 resolving manifests
168 overwrite None partial False
169 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336
170 170 rev: versions differ -> m
171 171 preserving rev for resolve of rev
172 172 picked tool 'python ../merge' for rev (binary False symlink False)
@@ -183,15 +183,15 b' created new head'
183 183 --------------
184 184 test L: R:nm a b W: - 7 get b
185 185 --------------
186 resolving manifests
187 overwrite None partial False
188 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b
189 186 searching for copies back to rev 1
190 187 unmatched files in other:
191 188 b
192 189 all copies found (* = to merge, ! = divergent):
193 190 b -> a
194 191 checking for directory renames
192 resolving manifests
193 overwrite None partial False
194 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b
195 195 a: other deleted -> r
196 196 rev: versions differ -> m
197 197 b: remote created -> g
@@ -211,15 +211,15 b' created new head'
211 211 --------------
212 212 test L:nm a b R: W: - 8 nothing
213 213 --------------
214 resolving manifests
215 overwrite None partial False
216 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336
217 214 searching for copies back to rev 1
218 215 unmatched files in local:
219 216 b
220 217 all copies found (* = to merge, ! = divergent):
221 218 b -> a
222 219 checking for directory renames
220 resolving manifests
221 overwrite None partial False
222 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336
223 223 rev: versions differ -> m
224 224 preserving rev for resolve of rev
225 225 picked tool 'python ../merge' for rev (binary False symlink False)
@@ -235,10 +235,10 b' created new head'
235 235 --------------
236 236 test L:um a b R:um a b W: - 9 do merge with ancestor in a
237 237 --------------
238 searching for copies back to rev 1
238 239 resolving manifests
239 240 overwrite None partial False
240 241 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7
241 searching for copies back to rev 1
242 242 b: versions differ -> m
243 243 rev: versions differ -> m
244 244 preserving b for resolve of b
@@ -259,9 +259,6 b' created new head'
259 259 --------------
260 260 test L:nm a b R:nm a c W: - 11 get c, keep b
261 261 --------------
262 resolving manifests
263 overwrite None partial False
264 ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2
265 262 searching for copies back to rev 1
266 263 unmatched files in local:
267 264 b
@@ -272,6 +269,9 b' resolving manifests'
272 269 b -> a !
273 270 checking for directory renames
274 271 a: divergent renames -> dr
272 resolving manifests
273 overwrite None partial False
274 ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2
275 275 rev: versions differ -> m
276 276 c: remote created -> g
277 277 preserving rev for resolve of rev
@@ -293,10 +293,10 b' created new head'
293 293 --------------
294 294 test L:nc a b R:up b W: - 12 merge b no ancestor
295 295 --------------
296 searching for copies back to rev 1
296 297 resolving manifests
297 298 overwrite None partial False
298 299 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7
299 searching for copies back to rev 1
300 300 b: versions differ -> m
301 301 rev: versions differ -> m
302 302 preserving b for resolve of b
@@ -318,10 +318,10 b' created new head'
318 318 --------------
319 319 test L:up b R:nm a b W: - 13 merge b no ancestor
320 320 --------------
321 searching for copies back to rev 1
321 322 resolving manifests
322 323 overwrite None partial False
323 324 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
324 searching for copies back to rev 1
325 325 a: other deleted -> r
326 326 b: versions differ -> m
327 327 rev: versions differ -> m
@@ -344,10 +344,10 b' created new head'
344 344 --------------
345 345 test L:nc a b R:up a b W: - 14 merge b no ancestor
346 346 --------------
347 searching for copies back to rev 1
347 348 resolving manifests
348 349 overwrite None partial False
349 350 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
350 searching for copies back to rev 1
351 351 a: remote is newer -> g
352 352 b: versions differ -> m
353 353 rev: versions differ -> m
@@ -371,10 +371,10 b' created new head'
371 371 --------------
372 372 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
373 373 --------------
374 searching for copies back to rev 1
374 375 resolving manifests
375 376 overwrite None partial False
376 377 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
377 searching for copies back to rev 1
378 378 a: other deleted -> r
379 379 b: versions differ -> m
380 380 rev: versions differ -> m
@@ -397,10 +397,10 b' created new head'
397 397 --------------
398 398 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
399 399 --------------
400 searching for copies back to rev 1
400 401 resolving manifests
401 402 overwrite None partial False
402 403 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
403 searching for copies back to rev 1
404 404 a: remote is newer -> g
405 405 b: versions differ -> m
406 406 rev: versions differ -> m
@@ -424,10 +424,10 b' created new head'
424 424 --------------
425 425 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
426 426 --------------
427 searching for copies back to rev 1
427 428 resolving manifests
428 429 overwrite None partial False
429 430 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7
430 searching for copies back to rev 1
431 431 b: versions differ -> m
432 432 rev: versions differ -> m
433 433 preserving b for resolve of b
@@ -449,10 +449,10 b' created new head'
449 449 --------------
450 450 test L:nm a b R:up a b W: - 18 merge b no ancestor
451 451 --------------
452 searching for copies back to rev 1
452 453 resolving manifests
453 454 overwrite None partial False
454 455 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a
455 searching for copies back to rev 1
456 456 b: versions differ -> m
457 457 rev: versions differ -> m
458 458 remote changed a which local deleted
@@ -478,10 +478,10 b' created new head'
478 478 --------------
479 479 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
480 480 --------------
481 searching for copies back to rev 1
481 482 resolving manifests
482 483 overwrite None partial False
483 484 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b
484 searching for copies back to rev 1
485 485 local changed a which remote deleted
486 486 use (c)hanged version or (d)elete? c
487 487 a: prompt keep -> a
@@ -506,15 +506,15 b' created new head'
506 506 --------------
507 507 test L:up a R:um a b W: - 20 merge a and b to b, remove a
508 508 --------------
509 resolving manifests
510 overwrite None partial False
511 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7
512 509 searching for copies back to rev 1
513 510 unmatched files in other:
514 511 b
515 512 all copies found (* = to merge, ! = divergent):
516 513 b -> a *
517 514 checking for directory renames
515 resolving manifests
516 overwrite None partial False
517 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7
518 518 rev: versions differ -> m
519 519 a: remote moved to b -> m
520 520 preserving a for resolve of b
@@ -537,15 +537,15 b' created new head'
537 537 --------------
538 538 test L:um a b R:up a W: - 21 merge a and b to b
539 539 --------------
540 resolving manifests
541 overwrite None partial False
542 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71
543 540 searching for copies back to rev 1
544 541 unmatched files in local:
545 542 b
546 543 all copies found (* = to merge, ! = divergent):
547 544 b -> a *
548 545 checking for directory renames
546 resolving manifests
547 overwrite None partial False
548 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71
549 549 b: local copied/moved to a -> m
550 550 rev: versions differ -> m
551 551 preserving b for resolve of b
@@ -567,9 +567,6 b' created new head'
567 567 --------------
568 568 test L:nm a b R:up a c W: - 23 get c, keep b
569 569 --------------
570 resolving manifests
571 overwrite None partial False
572 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f
573 570 searching for copies back to rev 1
574 571 unmatched files in local:
575 572 b
@@ -578,6 +575,9 b' resolving manifests'
578 575 all copies found (* = to merge, ! = divergent):
579 576 b -> a *
580 577 checking for directory renames
578 resolving manifests
579 overwrite None partial False
580 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f
581 581 b: local copied/moved to a -> m
582 582 rev: versions differ -> m
583 583 c: remote created -> g
Show file before | Show file after | Hide comments
@@ -15,12 +15,12 b' user: test'
15 15 date: Mon Jan 12 13:46:40 1970 +0000
16 16 summary: 1
17 17
18 searching for copies back to rev 1
19 unmatched files in other:
20 b
18 21 resolving manifests
19 22 overwrite False partial False
20 23 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
21 searching for copies back to rev 1
22 unmatched files in other:
23 b
24 24 a: versions differ -> m
25 25 b: remote created -> g
26 26 preserving a for resolve of a
@@ -37,7 +37,7 b' summary: 2'
37 37
38 38 resolving manifests
39 39 overwrite False partial False
40 ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b
40 ancestor 802f095af299 local 802f095af299+ remote 33aaa84a386b
41 41 a: versions differ -> m
42 42 b: other deleted -> r
43 43 preserving a for resolve of a
@@ -59,12 +59,12 b' user: test'
59 59 date: Mon Jan 12 13:46:40 1970 +0000
60 60 summary: 1
61 61
62 searching for copies back to rev 1
63 unmatched files in other:
64 b
62 65 resolving manifests
63 66 overwrite False partial False
64 67 ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
65 searching for copies back to rev 1
66 unmatched files in other:
67 b
68 68 a: versions differ -> m
69 69 b: remote created -> g
70 70 preserving a for resolve of a
@@ -115,10 +115,10 b" abort: crosses branches (use 'hg merge' "
115 115 failed
116 116 abort: outstanding uncommitted changes (use 'hg status' to list changes)
117 117 failed
118 searching for copies back to rev 1
118 119 resolving manifests
119 120 overwrite False partial False
120 121 ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d
121 searching for copies back to rev 1
122 122 a: versions differ -> m
123 123 b: versions differ -> m
124 124 preserving a for resolve of a
Show file before | Show file after | Hide comments
@@ -42,7 +42,7 b' side1'
42 42 side2
43 43 resolving manifests
44 44 overwrite True partial False
45 ancestor 537353581d3d local ded32b0db104+ remote 221226fb2bd8
45 ancestor ded32b0db104+ local ded32b0db104+ remote 221226fb2bd8
46 46 side2: other deleted -> r
47 47 side1: other deleted -> r
48 48 main: remote created -> g
General Comments 0
You need to be logged in to leave comments. Login now