Show More
@@ -255,6 +255,7 b' def applyupdates(repo, action, wctx, mct' | |||
|
255 | 255 | substate = wctx.substate # prime |
|
256 | 256 | |
|
257 | 257 | # prescan for merges |
|
258 | u = repo.ui | |
|
258 | 259 | for a in action: |
|
259 | 260 | f, m = a[:2] |
|
260 | 261 | if m == 'm': # merge |
@@ -277,8 +278,10 b' def applyupdates(repo, action, wctx, mct' | |||
|
277 | 278 | |
|
278 | 279 | audit_path = util.path_auditor(repo.root) |
|
279 | 280 | |
|
280 | for a in action: | |
|
281 | numupdates = len(action) | |
|
282 | for i, a in enumerate(action): | |
|
281 | 283 | f, m = a[:2] |
|
284 | u.progress('update', i + 1, item=f, total=numupdates, unit='files') | |
|
282 | 285 | if f and f[0] == "/": |
|
283 | 286 | continue |
|
284 | 287 | if m == "r": # remove |
@@ -338,6 +341,7 b' def applyupdates(repo, action, wctx, mct' | |||
|
338 | 341 | elif m == "e": # exec |
|
339 | 342 | flags = a[2] |
|
340 | 343 | util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
|
344 | u.progress('update', None, total=numupdates, unit='files') | |
|
341 | 345 | |
|
342 | 346 | return updated, merged, removed, unresolved |
|
343 | 347 |
@@ -15,10 +15,12 b' resolving manifests' | |||
|
15 | 15 | preserving a for resolve of b |
|
16 | 16 | preserving a for resolve of c |
|
17 | 17 | removing a |
|
18 | update: a 1/2 files (50.00%) | |
|
18 | 19 | picked tool 'internal:merge' for b (binary False symlink False) |
|
19 | 20 | merging a and b to b |
|
20 | 21 | my b@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 |
|
21 | 22 | premerge successful |
|
23 | update: a 2/2 files (100.00%) | |
|
22 | 24 | picked tool 'internal:merge' for c (binary False symlink False) |
|
23 | 25 | merging a and c to c |
|
24 | 26 | my c@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 |
@@ -17,10 +17,12 b' resolving manifests' | |||
|
17 | 17 | foo: remote copied to bar -> m |
|
18 | 18 | preserving foo for resolve of bar |
|
19 | 19 | preserving foo for resolve of foo |
|
20 | update: foo 1/2 files (50.00%) | |
|
20 | 21 | picked tool 'internal:merge' for bar (binary False symlink False) |
|
21 | 22 | merging foo and bar to bar |
|
22 | 23 | my bar@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da |
|
23 | 24 | premerge successful |
|
25 | update: foo 2/2 files (100.00%) | |
|
24 | 26 | picked tool 'internal:merge' for foo (binary False symlink False) |
|
25 | 27 | merging foo |
|
26 | 28 | my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da |
@@ -8,6 +8,7 b' resolving manifests' | |||
|
8 | 8 | overwrite None partial False |
|
9 | 9 | ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee |
|
10 | 10 | foo: remote is newer -> g |
|
11 | update: foo 1/1 files (100.00%) | |
|
11 | 12 | getting foo |
|
12 | 13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 14 | (branch merge, don't forget to commit) |
@@ -13,7 +13,9 b' resolving manifests' | |||
|
13 | 13 | ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c |
|
14 | 14 | 1: other deleted -> r |
|
15 | 15 | 1a: remote created -> g |
|
16 | update: 1 1/2 files (50.00%) | |
|
16 | 17 | removing 1 |
|
18 | update: 1a 2/2 files (100.00%) | |
|
17 | 19 | getting 1a |
|
18 | 20 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
19 | 21 | (branch merge, don't forget to commit) |
@@ -31,6 +33,7 b' resolving manifests' | |||
|
31 | 33 | ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96 |
|
32 | 34 | 1a: local copied/moved to 1 -> m |
|
33 | 35 | preserving 1a for resolve of 1a |
|
36 | update: 1a 1/1 files (100.00%) | |
|
34 | 37 | picked tool 'internal:merge' for 1a (binary False symlink False) |
|
35 | 38 | merging 1a and 1 to 1a |
|
36 | 39 | my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d |
@@ -50,6 +53,7 b' resolving manifests' | |||
|
50 | 53 | 1: remote moved to 1a -> m |
|
51 | 54 | preserving 1 for resolve of 1a |
|
52 | 55 | removing 1 |
|
56 | update: 1 1/1 files (100.00%) | |
|
53 | 57 | picked tool 'internal:merge' for 1a (binary False symlink False) |
|
54 | 58 | merging 1 and 1a to 1a |
|
55 | 59 | my 1a@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d |
@@ -28,6 +28,7 b' resolving manifests' | |||
|
28 | 28 | ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1 |
|
29 | 29 | bar: versions differ -> m |
|
30 | 30 | preserving bar for resolve of bar |
|
31 | update: bar 1/1 files (100.00%) | |
|
31 | 32 | picked tool 'internal:merge' for bar (binary False symlink False) |
|
32 | 33 | merging bar |
|
33 | 34 | my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510 |
@@ -78,6 +79,7 b' resolving manifests' | |||
|
78 | 79 | ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897 |
|
79 | 80 | bar: versions differ -> m |
|
80 | 81 | preserving bar for resolve of bar |
|
82 | update: bar 1/1 files (100.00%) | |
|
81 | 83 | picked tool 'internal:merge' for bar (binary False symlink False) |
|
82 | 84 | merging bar |
|
83 | 85 | my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510 |
@@ -8,6 +8,7 b' resolving manifests' | |||
|
8 | 8 | conflicting flags for a |
|
9 | 9 | (n)one, e(x)ec or sym(l)ink? n |
|
10 | 10 | a: update permissions -> e |
|
11 | update: a 1/1 files (100.00%) | |
|
11 | 12 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
12 | 13 | (branch merge, don't forget to commit) |
|
13 | 14 | % symlink is local parent, executable is other |
@@ -20,6 +21,7 b' resolving manifests' | |||
|
20 | 21 | conflicting flags for a |
|
21 | 22 | (n)one, e(x)ec or sym(l)ink? n |
|
22 | 23 | a: remote is newer -> g |
|
24 | update: a 1/1 files (100.00%) | |
|
23 | 25 | getting a |
|
24 | 26 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
25 | 27 | (branch merge, don't forget to commit) |
@@ -25,6 +25,7 b' resolving manifests' | |||
|
25 | 25 | ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360 |
|
26 | 26 | test.txt: versions differ -> m |
|
27 | 27 | preserving test.txt for resolve of test.txt |
|
28 | update: test.txt 1/1 files (100.00%) | |
|
28 | 29 | picked tool 'internal:merge' for test.txt (binary False symlink False) |
|
29 | 30 | merging test.txt |
|
30 | 31 | my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 |
@@ -28,11 +28,17 b' resolving manifests' | |||
|
28 | 28 | a/a: other deleted -> r |
|
29 | 29 | b/a: remote created -> g |
|
30 | 30 | b/b: remote created -> g |
|
31 | update: a/a 1/6 files (16.67%) | |
|
31 | 32 | removing a/a |
|
33 | update: a/b 2/6 files (33.33%) | |
|
32 | 34 | removing a/b |
|
35 | update: a/c 3/6 files (50.00%) | |
|
33 | 36 | moving a/c to b/c |
|
37 | update: a/d 4/6 files (66.67%) | |
|
34 | 38 | moving a/d to b/d |
|
39 | update: b/a 5/6 files (83.33%) | |
|
35 | 40 | getting b/a |
|
41 | update: b/b 6/6 files (100.00%) | |
|
36 | 42 | getting b/b |
|
37 | 43 | 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
38 | 44 | (branch merge, don't forget to commit) |
@@ -64,6 +70,7 b' resolving manifests' | |||
|
64 | 70 | overwrite None partial False |
|
65 | 71 | ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb |
|
66 | 72 | None: local renamed directory to b/c -> d |
|
73 | update:None 1/1 files (100.00%) | |
|
67 | 74 | getting a/c to b/c |
|
68 | 75 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
69 | 76 | (branch merge, don't forget to commit) |
@@ -21,13 +21,16 b' resolving manifests' | |||
|
21 | 21 | b2: remote created -> g |
|
22 | 22 | preserving a for resolve of b |
|
23 | 23 | removing a |
|
24 | update: a 1/3 files (33.33%) | |
|
24 | 25 | picked tool 'internal:merge' for b (binary False symlink False) |
|
25 | 26 | merging a and b to b |
|
26 | 27 | my b@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c |
|
27 | 28 | premerge successful |
|
29 | update: a2 2/3 files (66.67%) | |
|
28 | 30 | warning: detected divergent renames of a2 to: |
|
29 | 31 | c2 |
|
30 | 32 | b2 |
|
33 | update: b2 3/3 files (100.00%) | |
|
31 | 34 | getting b2 |
|
32 | 35 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
33 | 36 | (branch merge, don't forget to commit) |
@@ -15,10 +15,12 b' resolving manifests' | |||
|
15 | 15 | a: remote copied to b -> m |
|
16 | 16 | preserving a for resolve of b |
|
17 | 17 | preserving rev for resolve of rev |
|
18 | update: a 1/2 files (50.00%) | |
|
18 | 19 | picked tool 'python ../merge' for b (binary False symlink False) |
|
19 | 20 | merging a and b to b |
|
20 | 21 | my b@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 |
|
21 | 22 | premerge successful |
|
23 | update: rev 2/2 files (100.00%) | |
|
22 | 24 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
23 | 25 | merging rev |
|
24 | 26 | my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 |
@@ -48,11 +50,14 b' resolving manifests' | |||
|
48 | 50 | rev: versions differ -> m |
|
49 | 51 | preserving b for resolve of b |
|
50 | 52 | preserving rev for resolve of rev |
|
53 | update: a 1/3 files (33.33%) | |
|
51 | 54 | getting a |
|
55 | update: b 2/3 files (66.67%) | |
|
52 | 56 | picked tool 'python ../merge' for b (binary False symlink False) |
|
53 | 57 | merging b and a to b |
|
54 | 58 | my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
55 | 59 | premerge successful |
|
60 | update: rev 3/3 files (100.00%) | |
|
56 | 61 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
57 | 62 | merging rev |
|
58 | 63 | my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
@@ -82,10 +87,12 b' resolving manifests' | |||
|
82 | 87 | preserving a for resolve of b |
|
83 | 88 | preserving rev for resolve of rev |
|
84 | 89 | removing a |
|
90 | update: a 1/2 files (50.00%) | |
|
85 | 91 | picked tool 'python ../merge' for b (binary False symlink False) |
|
86 | 92 | merging a and b to b |
|
87 | 93 | my b@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 |
|
88 | 94 | premerge successful |
|
95 | update: rev 2/2 files (100.00%) | |
|
89 | 96 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
90 | 97 | merging rev |
|
91 | 98 | my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 |
@@ -113,10 +120,12 b' resolving manifests' | |||
|
113 | 120 | rev: versions differ -> m |
|
114 | 121 | preserving b for resolve of b |
|
115 | 122 | preserving rev for resolve of rev |
|
123 | update: b 1/2 files (50.00%) | |
|
116 | 124 | picked tool 'python ../merge' for b (binary False symlink False) |
|
117 | 125 | merging b and a to b |
|
118 | 126 | my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
119 | 127 | premerge successful |
|
128 | update: rev 2/2 files (100.00%) | |
|
120 | 129 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
121 | 130 | merging rev |
|
122 | 131 | my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
@@ -143,7 +152,9 b' resolving manifests' | |||
|
143 | 152 | rev: versions differ -> m |
|
144 | 153 | b: remote created -> g |
|
145 | 154 | preserving rev for resolve of rev |
|
155 | update: b 1/2 files (50.00%) | |
|
146 | 156 | getting b |
|
157 | update: rev 2/2 files (100.00%) | |
|
147 | 158 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
148 | 159 | merging rev |
|
149 | 160 | my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 |
@@ -169,6 +180,7 b' resolving manifests' | |||
|
169 | 180 | ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336 |
|
170 | 181 | rev: versions differ -> m |
|
171 | 182 | preserving rev for resolve of rev |
|
183 | update: rev 1/1 files (100.00%) | |
|
172 | 184 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
173 | 185 | merging rev |
|
174 | 186 | my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 |
@@ -196,8 +208,11 b' resolving manifests' | |||
|
196 | 208 | rev: versions differ -> m |
|
197 | 209 | b: remote created -> g |
|
198 | 210 | preserving rev for resolve of rev |
|
211 | update: a 1/3 files (33.33%) | |
|
199 | 212 | removing a |
|
213 | update: b 2/3 files (66.67%) | |
|
200 | 214 | getting b |
|
215 | update: rev 3/3 files (100.00%) | |
|
201 | 216 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
202 | 217 | merging rev |
|
203 | 218 | my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337 |
@@ -222,6 +237,7 b' resolving manifests' | |||
|
222 | 237 | ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336 |
|
223 | 238 | rev: versions differ -> m |
|
224 | 239 | preserving rev for resolve of rev |
|
240 | update: rev 1/1 files (100.00%) | |
|
225 | 241 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
226 | 242 | merging rev |
|
227 | 243 | my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 |
@@ -243,9 +259,11 b' resolving manifests' | |||
|
243 | 259 | rev: versions differ -> m |
|
244 | 260 | preserving b for resolve of b |
|
245 | 261 | preserving rev for resolve of rev |
|
262 | update: b 1/2 files (50.00%) | |
|
246 | 263 | picked tool 'python ../merge' for b (binary False symlink False) |
|
247 | 264 | merging b |
|
248 | 265 | my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337 |
|
266 | update: rev 2/2 files (100.00%) | |
|
249 | 267 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
250 | 268 | merging rev |
|
251 | 269 | my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
@@ -275,10 +293,13 b' resolving manifests' | |||
|
275 | 293 | rev: versions differ -> m |
|
276 | 294 | c: remote created -> g |
|
277 | 295 | preserving rev for resolve of rev |
|
296 | update: a 1/3 files (33.33%) | |
|
278 | 297 | warning: detected divergent renames of a to: |
|
279 | 298 | b |
|
280 | 299 | c |
|
300 | update: c 2/3 files (66.67%) | |
|
281 | 301 | getting c |
|
302 | update: rev 3/3 files (100.00%) | |
|
282 | 303 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
283 | 304 | merging rev |
|
284 | 305 | my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337 |
@@ -301,9 +322,11 b' resolving manifests' | |||
|
301 | 322 | rev: versions differ -> m |
|
302 | 323 | preserving b for resolve of b |
|
303 | 324 | preserving rev for resolve of rev |
|
325 | update: b 1/2 files (50.00%) | |
|
304 | 326 | picked tool 'python ../merge' for b (binary False symlink False) |
|
305 | 327 | merging b |
|
306 | 328 | my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000 |
|
329 | update: rev 2/2 files (100.00%) | |
|
307 | 330 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
308 | 331 | merging rev |
|
309 | 332 | my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
@@ -327,10 +350,13 b' resolving manifests' | |||
|
327 | 350 | rev: versions differ -> m |
|
328 | 351 | preserving b for resolve of b |
|
329 | 352 | preserving rev for resolve of rev |
|
353 | update: a 1/3 files (33.33%) | |
|
330 | 354 | removing a |
|
355 | update: b 2/3 files (66.67%) | |
|
331 | 356 | picked tool 'python ../merge' for b (binary False symlink False) |
|
332 | 357 | merging b |
|
333 | 358 | my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
|
359 | update: rev 3/3 files (100.00%) | |
|
334 | 360 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
335 | 361 | merging rev |
|
336 | 362 | my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
@@ -353,10 +379,13 b' resolving manifests' | |||
|
353 | 379 | rev: versions differ -> m |
|
354 | 380 | preserving b for resolve of b |
|
355 | 381 | preserving rev for resolve of rev |
|
382 | update: a 1/3 files (33.33%) | |
|
356 | 383 | getting a |
|
384 | update: b 2/3 files (66.67%) | |
|
357 | 385 | picked tool 'python ../merge' for b (binary False symlink False) |
|
358 | 386 | merging b |
|
359 | 387 | my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
|
388 | update: rev 3/3 files (100.00%) | |
|
360 | 389 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
361 | 390 | merging rev |
|
362 | 391 | my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
@@ -380,10 +409,13 b' resolving manifests' | |||
|
380 | 409 | rev: versions differ -> m |
|
381 | 410 | preserving b for resolve of b |
|
382 | 411 | preserving rev for resolve of rev |
|
412 | update: a 1/3 files (33.33%) | |
|
383 | 413 | removing a |
|
414 | update: b 2/3 files (66.67%) | |
|
384 | 415 | picked tool 'python ../merge' for b (binary False symlink False) |
|
385 | 416 | merging b |
|
386 | 417 | my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
|
418 | update: rev 3/3 files (100.00%) | |
|
387 | 419 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
388 | 420 | merging rev |
|
389 | 421 | my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
@@ -406,10 +438,13 b' resolving manifests' | |||
|
406 | 438 | rev: versions differ -> m |
|
407 | 439 | preserving b for resolve of b |
|
408 | 440 | preserving rev for resolve of rev |
|
441 | update: a 1/3 files (33.33%) | |
|
409 | 442 | getting a |
|
443 | update: b 2/3 files (66.67%) | |
|
410 | 444 | picked tool 'python ../merge' for b (binary False symlink False) |
|
411 | 445 | merging b |
|
412 | 446 | my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
|
447 | update: rev 3/3 files (100.00%) | |
|
413 | 448 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
414 | 449 | merging rev |
|
415 | 450 | my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
@@ -432,9 +467,11 b' resolving manifests' | |||
|
432 | 467 | rev: versions differ -> m |
|
433 | 468 | preserving b for resolve of b |
|
434 | 469 | preserving rev for resolve of rev |
|
470 | update: b 1/2 files (50.00%) | |
|
435 | 471 | picked tool 'python ../merge' for b (binary False symlink False) |
|
436 | 472 | merging b |
|
437 | 473 | my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000 |
|
474 | update: rev 2/2 files (100.00%) | |
|
438 | 475 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
439 | 476 | merging rev |
|
440 | 477 | my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337 |
@@ -460,10 +497,13 b' use (c)hanged version or leave (d)eleted' | |||
|
460 | 497 | a: prompt recreating -> g |
|
461 | 498 | preserving b for resolve of b |
|
462 | 499 | preserving rev for resolve of rev |
|
500 | update: a 1/3 files (33.33%) | |
|
463 | 501 | getting a |
|
502 | update: b 2/3 files (66.67%) | |
|
464 | 503 | picked tool 'python ../merge' for b (binary False symlink False) |
|
465 | 504 | merging b |
|
466 | 505 | my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000 |
|
506 | update: rev 3/3 files (100.00%) | |
|
467 | 507 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
468 | 508 | merging rev |
|
469 | 509 | my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337 |
@@ -489,9 +529,12 b' use (c)hanged version or (d)elete? c' | |||
|
489 | 529 | rev: versions differ -> m |
|
490 | 530 | preserving b for resolve of b |
|
491 | 531 | preserving rev for resolve of rev |
|
532 | update: a 1/3 files (33.33%) | |
|
533 | update: b 2/3 files (66.67%) | |
|
492 | 534 | picked tool 'python ../merge' for b (binary False symlink False) |
|
493 | 535 | merging b |
|
494 | 536 | my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000 |
|
537 | update: rev 3/3 files (100.00%) | |
|
495 | 538 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
496 | 539 | merging rev |
|
497 | 540 | my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337 |
@@ -520,9 +563,11 b' resolving manifests' | |||
|
520 | 563 | preserving a for resolve of b |
|
521 | 564 | preserving rev for resolve of rev |
|
522 | 565 | removing a |
|
566 | update: a 1/2 files (50.00%) | |
|
523 | 567 | picked tool 'python ../merge' for b (binary False symlink False) |
|
524 | 568 | merging a and b to b |
|
525 | 569 | my b@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 |
|
570 | update: rev 2/2 files (100.00%) | |
|
526 | 571 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
527 | 572 | merging rev |
|
528 | 573 | my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
@@ -550,9 +595,11 b' resolving manifests' | |||
|
550 | 595 | rev: versions differ -> m |
|
551 | 596 | preserving b for resolve of b |
|
552 | 597 | preserving rev for resolve of rev |
|
598 | update: b 1/2 files (50.00%) | |
|
553 | 599 | picked tool 'python ../merge' for b (binary False symlink False) |
|
554 | 600 | merging b and a to b |
|
555 | 601 | my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
602 | update: rev 2/2 files (100.00%) | |
|
556 | 603 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
557 | 604 | merging rev |
|
558 | 605 | my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
@@ -583,11 +630,14 b' resolving manifests' | |||
|
583 | 630 | c: remote created -> g |
|
584 | 631 | preserving b for resolve of b |
|
585 | 632 | preserving rev for resolve of rev |
|
633 | update: b 1/3 files (33.33%) | |
|
586 | 634 | picked tool 'python ../merge' for b (binary False symlink False) |
|
587 | 635 | merging b and a to b |
|
588 | 636 | my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 |
|
589 | 637 | premerge successful |
|
638 | update: c 2/3 files (66.67%) | |
|
590 | 639 | getting c |
|
640 | update: rev 3/3 files (100.00%) | |
|
591 | 641 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
592 | 642 | merging rev |
|
593 | 643 | my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337 |
@@ -56,6 +56,7 b' resolving manifests' | |||
|
56 | 56 | overwrite None partial False |
|
57 | 57 | ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4 |
|
58 | 58 | .hgsubstate: versions differ -> m |
|
59 | update: .hgsubstate 1/1 files (100.00%) | |
|
59 | 60 | subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
|
60 | 61 | subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
|
61 | 62 | getting subrepo t |
@@ -63,6 +64,7 b' resolving manifests' | |||
|
63 | 64 | overwrite True partial False |
|
64 | 65 | ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a |
|
65 | 66 | t: remote is newer -> g |
|
67 | update: t 1/1 files (100.00%) | |
|
66 | 68 | getting t |
|
67 | 69 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
68 | 70 | (branch merge, don't forget to commit) |
@@ -78,6 +80,7 b' resolving manifests' | |||
|
78 | 80 | overwrite None partial False |
|
79 | 81 | ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf |
|
80 | 82 | .hgsubstate: versions differ -> m |
|
83 | update: .hgsubstate 1/1 files (100.00%) | |
|
81 | 84 | subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
|
82 | 85 | subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
|
83 | 86 | merging subrepo t |
@@ -87,6 +90,7 b' resolving manifests' | |||
|
87 | 90 | ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 |
|
88 | 91 | t: versions differ -> m |
|
89 | 92 | preserving t for resolve of t |
|
93 | update: t 1/1 files (100.00%) | |
|
90 | 94 | picked tool 'internal:merge' for t (binary False symlink False) |
|
91 | 95 | merging t |
|
92 | 96 | my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
@@ -24,9 +24,11 b' resolving manifests' | |||
|
24 | 24 | a: versions differ -> m |
|
25 | 25 | b: remote created -> g |
|
26 | 26 | preserving a for resolve of a |
|
27 | update: a 1/2 files (50.00%) | |
|
27 | 28 | picked tool 'true' for a (binary False symlink False) |
|
28 | 29 | merging a |
|
29 | 30 | my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
|
31 | update: b 2/2 files (100.00%) | |
|
30 | 32 | getting b |
|
31 | 33 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
32 | 34 | changeset: 1:802f095af299 |
@@ -41,7 +43,9 b' resolving manifests' | |||
|
41 | 43 | a: versions differ -> m |
|
42 | 44 | b: other deleted -> r |
|
43 | 45 | preserving a for resolve of a |
|
46 | update: b 1/2 files (50.00%) | |
|
44 | 47 | removing b |
|
48 | update: a 2/2 files (100.00%) | |
|
45 | 49 | picked tool 'true' for a (binary False symlink False) |
|
46 | 50 | merging a |
|
47 | 51 | my a@802f095af299+ other a@33aaa84a386b ancestor a@33aaa84a386b |
@@ -68,9 +72,11 b' resolving manifests' | |||
|
68 | 72 | a: versions differ -> m |
|
69 | 73 | b: remote created -> g |
|
70 | 74 | preserving a for resolve of a |
|
75 | update: a 1/2 files (50.00%) | |
|
71 | 76 | picked tool 'true' for a (binary False symlink False) |
|
72 | 77 | merging a |
|
73 | 78 | my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
|
79 | update: b 2/2 files (100.00%) | |
|
74 | 80 | getting b |
|
75 | 81 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
76 | 82 | changeset: 1:802f095af299 |
@@ -123,9 +129,11 b' resolving manifests' | |||
|
123 | 129 | b: versions differ -> m |
|
124 | 130 | preserving a for resolve of a |
|
125 | 131 | preserving b for resolve of b |
|
132 | update: a 1/2 files (50.00%) | |
|
126 | 133 | picked tool 'true' for a (binary False symlink False) |
|
127 | 134 | merging a |
|
128 | 135 | my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b |
|
136 | update: b 2/2 files (100.00%) | |
|
129 | 137 | picked tool 'true' for b (binary False symlink False) |
|
130 | 138 | merging b |
|
131 | 139 | my b@802f095af299+ other b@030602aee63d ancestor b@000000000000 |
@@ -46,8 +46,11 b' resolving manifests' | |||
|
46 | 46 | side2: other deleted -> r |
|
47 | 47 | side1: other deleted -> r |
|
48 | 48 | main: remote created -> g |
|
49 | update: side1 1/3 files (33.33%) | |
|
49 | 50 | removing side1 |
|
51 | update: side2 2/3 files (66.67%) | |
|
50 | 52 | removing side2 |
|
53 | update: main 3/3 files (100.00%) | |
|
51 | 54 | getting main |
|
52 | 55 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
53 | 56 | Should only show a main |
General Comments 0
You need to be logged in to leave comments.
Login now