Show More
@@ -286,7 +286,7 b' def applyupdates(repo, action, wctx, mct' | |||
|
286 | 286 | numupdates = len(action) |
|
287 | 287 | for i, a in enumerate(action): |
|
288 | 288 | f, m = a[:2] |
|
289 |
u.progress('updat |
|
|
289 | u.progress(_('updating'), i + 1, item=f, total=numupdates, unit='files') | |
|
290 | 290 | if f and f[0] == "/": |
|
291 | 291 | continue |
|
292 | 292 | if m == "r": # remove |
@@ -346,7 +346,7 b' def applyupdates(repo, action, wctx, mct' | |||
|
346 | 346 | elif m == "e": # exec |
|
347 | 347 | flags = a[2] |
|
348 | 348 | util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
|
349 |
u.progress('updat |
|
|
349 | u.progress(_('updating'), None, total=numupdates, unit='files') | |
|
350 | 350 | |
|
351 | 351 | return updated, merged, removed, unresolved |
|
352 | 352 |
@@ -15,12 +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 |
updat |
|
|
18 | updating: a 1/2 files (50.00%) | |
|
19 | 19 | picked tool 'internal:merge' for b (binary False symlink False) |
|
20 | 20 | merging a and b to b |
|
21 | 21 | my b@fb3948d97f07+ other b@7f1309517659 ancestor a@583c7b748052 |
|
22 | 22 | premerge successful |
|
23 |
updat |
|
|
23 | updating: a 2/2 files (100.00%) | |
|
24 | 24 | picked tool 'internal:merge' for c (binary False symlink False) |
|
25 | 25 | merging a and c to c |
|
26 | 26 | my c@fb3948d97f07+ other c@7f1309517659 ancestor a@583c7b748052 |
@@ -17,12 +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 |
updat |
|
|
20 | updating: foo 1/2 files (50.00%) | |
|
21 | 21 | picked tool 'internal:merge' for bar (binary False symlink False) |
|
22 | 22 | merging foo and bar to bar |
|
23 | 23 | my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da |
|
24 | 24 | premerge successful |
|
25 |
updat |
|
|
25 | updating: foo 2/2 files (100.00%) | |
|
26 | 26 | picked tool 'internal:merge' for foo (binary False symlink False) |
|
27 | 27 | merging foo |
|
28 | 28 | my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da |
@@ -8,7 +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 |
updat |
|
|
11 | updating: foo 1/1 files (100.00%) | |
|
12 | 12 | getting foo |
|
13 | 13 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
14 | 14 | (branch merge, don't forget to commit) |
@@ -13,9 +13,9 b' resolving manifests' | |||
|
13 | 13 | ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a |
|
14 | 14 | 1: other deleted -> r |
|
15 | 15 | 1a: remote created -> g |
|
16 |
updat |
|
|
16 | updating: 1 1/2 files (50.00%) | |
|
17 | 17 | removing 1 |
|
18 |
updat |
|
|
18 | updating: 1a 2/2 files (100.00%) | |
|
19 | 19 | getting 1a |
|
20 | 20 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
21 | 21 | (branch merge, don't forget to commit) |
@@ -33,7 +33,7 b' resolving manifests' | |||
|
33 | 33 | ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96 |
|
34 | 34 | 1a: local copied/moved to 1 -> m |
|
35 | 35 | preserving 1a for resolve of 1a |
|
36 |
updat |
|
|
36 | updating: 1a 1/1 files (100.00%) | |
|
37 | 37 | picked tool 'internal:merge' for 1a (binary False symlink False) |
|
38 | 38 | merging 1a and 1 to 1a |
|
39 | 39 | my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d |
@@ -53,7 +53,7 b' resolving manifests' | |||
|
53 | 53 | 1: remote moved to 1a -> m |
|
54 | 54 | preserving 1 for resolve of 1a |
|
55 | 55 | removing 1 |
|
56 |
updat |
|
|
56 | updating: 1 1/1 files (100.00%) | |
|
57 | 57 | picked tool 'internal:merge' for 1a (binary False symlink False) |
|
58 | 58 | merging 1 and 1a to 1a |
|
59 | 59 | my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d |
@@ -28,7 +28,7 b' resolving manifests' | |||
|
28 | 28 | ancestor 0f2ff26688b9 local 2263c1be0967+ remote 0555950ead28 |
|
29 | 29 | bar: versions differ -> m |
|
30 | 30 | preserving bar for resolve of bar |
|
31 |
updat |
|
|
31 | updating: bar 1/1 files (100.00%) | |
|
32 | 32 | picked tool 'internal:merge' for bar (binary False symlink False) |
|
33 | 33 | merging bar |
|
34 | 34 | my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 |
@@ -79,7 +79,7 b' resolving manifests' | |||
|
79 | 79 | ancestor 0f2ff26688b9 local 2263c1be0967+ remote 3ffa6b9e35f0 |
|
80 | 80 | bar: versions differ -> m |
|
81 | 81 | preserving bar for resolve of bar |
|
82 |
updat |
|
|
82 | updating: bar 1/1 files (100.00%) | |
|
83 | 83 | picked tool 'internal:merge' for bar (binary False symlink False) |
|
84 | 84 | merging bar |
|
85 | 85 | my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 |
@@ -8,7 +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 |
updat |
|
|
11 | updating: a 1/1 files (100.00%) | |
|
12 | 12 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 13 | (branch merge, don't forget to commit) |
|
14 | 14 | % symlink is local parent, executable is other |
@@ -21,7 +21,7 b' resolving manifests' | |||
|
21 | 21 | conflicting flags for a |
|
22 | 22 | (n)one, e(x)ec or sym(l)ink? n |
|
23 | 23 | a: remote is newer -> g |
|
24 |
updat |
|
|
24 | updating: a 1/1 files (100.00%) | |
|
25 | 25 | getting a |
|
26 | 26 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
27 | 27 | (branch merge, don't forget to commit) |
@@ -25,7 +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 |
updat |
|
|
28 | updating: test.txt 1/1 files (100.00%) | |
|
29 | 29 | picked tool 'internal:merge' for test.txt (binary False symlink False) |
|
30 | 30 | merging test.txt |
|
31 | 31 | my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9 |
@@ -28,17 +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 |
updat |
|
|
31 | updating: a/a 1/6 files (16.67%) | |
|
32 | 32 | removing a/a |
|
33 |
updat |
|
|
33 | updating: a/b 2/6 files (33.33%) | |
|
34 | 34 | removing a/b |
|
35 |
updat |
|
|
35 | updating: a/c 3/6 files (50.00%) | |
|
36 | 36 | moving a/c to b/c |
|
37 |
updat |
|
|
37 | updating: a/d 4/6 files (66.67%) | |
|
38 | 38 | moving a/d to b/d |
|
39 |
updat |
|
|
39 | updating: b/a 5/6 files (83.33%) | |
|
40 | 40 | getting b/a |
|
41 |
updat |
|
|
41 | updating: b/b 6/6 files (100.00%) | |
|
42 | 42 | getting b/b |
|
43 | 43 | 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
44 | 44 | (branch merge, don't forget to commit) |
@@ -70,7 +70,7 b' resolving manifests' | |||
|
70 | 70 | overwrite None partial False |
|
71 | 71 | ancestor f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb |
|
72 | 72 | None: local renamed directory to b/c -> d |
|
73 |
updat |
|
|
73 | updating:None 1/1 files (100.00%) | |
|
74 | 74 | getting a/c to b/c |
|
75 | 75 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
76 | 76 | (branch merge, don't forget to commit) |
@@ -21,16 +21,16 b' resolving manifests' | |||
|
21 | 21 | b2: remote created -> g |
|
22 | 22 | preserving a for resolve of b |
|
23 | 23 | removing a |
|
24 |
updat |
|
|
24 | updating: a 1/3 files (33.33%) | |
|
25 | 25 | picked tool 'internal:merge' for b (binary False symlink False) |
|
26 | 26 | merging a and b to b |
|
27 | 27 | my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
|
28 | 28 | premerge successful |
|
29 |
updat |
|
|
29 | updating: a2 2/3 files (66.67%) | |
|
30 | 30 | warning: detected divergent renames of a2 to: |
|
31 | 31 | c2 |
|
32 | 32 | b2 |
|
33 |
updat |
|
|
33 | updating: b2 3/3 files (100.00%) | |
|
34 | 34 | getting b2 |
|
35 | 35 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
36 | 36 | (branch merge, don't forget to commit) |
@@ -15,12 +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 |
updat |
|
|
18 | updating: a 1/2 files (50.00%) | |
|
19 | 19 | picked tool 'python ../merge' for b (binary False symlink False) |
|
20 | 20 | merging a and b to b |
|
21 | 21 | my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
|
22 | 22 | premerge successful |
|
23 |
updat |
|
|
23 | updating: rev 2/2 files (100.00%) | |
|
24 | 24 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
25 | 25 | merging rev |
|
26 | 26 | my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
@@ -50,14 +50,14 b' resolving manifests' | |||
|
50 | 50 | rev: versions differ -> m |
|
51 | 51 | preserving b for resolve of b |
|
52 | 52 | preserving rev for resolve of rev |
|
53 |
updat |
|
|
53 | updating: a 1/3 files (33.33%) | |
|
54 | 54 | getting a |
|
55 |
updat |
|
|
55 | updating: b 2/3 files (66.67%) | |
|
56 | 56 | picked tool 'python ../merge' for b (binary False symlink False) |
|
57 | 57 | merging b and a to b |
|
58 | 58 | my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
59 | 59 | premerge successful |
|
60 |
updat |
|
|
60 | updating: rev 3/3 files (100.00%) | |
|
61 | 61 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
62 | 62 | merging rev |
|
63 | 63 | my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
@@ -87,12 +87,12 b' resolving manifests' | |||
|
87 | 87 | preserving a for resolve of b |
|
88 | 88 | preserving rev for resolve of rev |
|
89 | 89 | removing a |
|
90 |
updat |
|
|
90 | updating: a 1/2 files (50.00%) | |
|
91 | 91 | picked tool 'python ../merge' for b (binary False symlink False) |
|
92 | 92 | merging a and b to b |
|
93 | 93 | my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
|
94 | 94 | premerge successful |
|
95 |
updat |
|
|
95 | updating: rev 2/2 files (100.00%) | |
|
96 | 96 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
97 | 97 | merging rev |
|
98 | 98 | my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
@@ -120,12 +120,12 b' resolving manifests' | |||
|
120 | 120 | rev: versions differ -> m |
|
121 | 121 | preserving b for resolve of b |
|
122 | 122 | preserving rev for resolve of rev |
|
123 |
updat |
|
|
123 | updating: b 1/2 files (50.00%) | |
|
124 | 124 | picked tool 'python ../merge' for b (binary False symlink False) |
|
125 | 125 | merging b and a to b |
|
126 | 126 | my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
127 | 127 | premerge successful |
|
128 |
updat |
|
|
128 | updating: rev 2/2 files (100.00%) | |
|
129 | 129 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
130 | 130 | merging rev |
|
131 | 131 | my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
@@ -152,9 +152,9 b' resolving manifests' | |||
|
152 | 152 | rev: versions differ -> m |
|
153 | 153 | b: remote created -> g |
|
154 | 154 | preserving rev for resolve of rev |
|
155 |
updat |
|
|
155 | updating: b 1/2 files (50.00%) | |
|
156 | 156 | getting b |
|
157 |
updat |
|
|
157 | updating: rev 2/2 files (100.00%) | |
|
158 | 158 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
159 | 159 | merging rev |
|
160 | 160 | my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
@@ -180,7 +180,7 b' resolving manifests' | |||
|
180 | 180 | ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336 |
|
181 | 181 | rev: versions differ -> m |
|
182 | 182 | preserving rev for resolve of rev |
|
183 |
updat |
|
|
183 | updating: rev 1/1 files (100.00%) | |
|
184 | 184 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
185 | 185 | merging rev |
|
186 | 186 | my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
@@ -208,11 +208,11 b' resolving manifests' | |||
|
208 | 208 | rev: versions differ -> m |
|
209 | 209 | b: remote created -> g |
|
210 | 210 | preserving rev for resolve of rev |
|
211 |
updat |
|
|
211 | updating: a 1/3 files (33.33%) | |
|
212 | 212 | removing a |
|
213 |
updat |
|
|
213 | updating: b 2/3 files (66.67%) | |
|
214 | 214 | getting b |
|
215 |
updat |
|
|
215 | updating: rev 3/3 files (100.00%) | |
|
216 | 216 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
217 | 217 | merging rev |
|
218 | 218 | my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
@@ -237,7 +237,7 b' resolving manifests' | |||
|
237 | 237 | ancestor 924404dff337 local 02963e448370+ remote 97c705ade336 |
|
238 | 238 | rev: versions differ -> m |
|
239 | 239 | preserving rev for resolve of rev |
|
240 |
updat |
|
|
240 | updating: rev 1/1 files (100.00%) | |
|
241 | 241 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
242 | 242 | merging rev |
|
243 | 243 | my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
@@ -259,11 +259,11 b' resolving manifests' | |||
|
259 | 259 | rev: versions differ -> m |
|
260 | 260 | preserving b for resolve of b |
|
261 | 261 | preserving rev for resolve of rev |
|
262 |
updat |
|
|
262 | updating: b 1/2 files (50.00%) | |
|
263 | 263 | picked tool 'python ../merge' for b (binary False symlink False) |
|
264 | 264 | merging b |
|
265 | 265 | my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
|
266 |
updat |
|
|
266 | updating: rev 2/2 files (100.00%) | |
|
267 | 267 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
268 | 268 | merging rev |
|
269 | 269 | my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
@@ -293,13 +293,13 b' resolving manifests' | |||
|
293 | 293 | rev: versions differ -> m |
|
294 | 294 | c: remote created -> g |
|
295 | 295 | preserving rev for resolve of rev |
|
296 |
updat |
|
|
296 | updating: a 1/3 files (33.33%) | |
|
297 | 297 | warning: detected divergent renames of a to: |
|
298 | 298 | b |
|
299 | 299 | c |
|
300 |
updat |
|
|
300 | updating: c 2/3 files (66.67%) | |
|
301 | 301 | getting c |
|
302 |
updat |
|
|
302 | updating: rev 3/3 files (100.00%) | |
|
303 | 303 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
304 | 304 | merging rev |
|
305 | 305 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
@@ -322,11 +322,11 b' resolving manifests' | |||
|
322 | 322 | rev: versions differ -> m |
|
323 | 323 | preserving b for resolve of b |
|
324 | 324 | preserving rev for resolve of rev |
|
325 |
updat |
|
|
325 | updating: b 1/2 files (50.00%) | |
|
326 | 326 | picked tool 'python ../merge' for b (binary False symlink False) |
|
327 | 327 | merging b |
|
328 | 328 | my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
|
329 |
updat |
|
|
329 | updating: rev 2/2 files (100.00%) | |
|
330 | 330 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
331 | 331 | merging rev |
|
332 | 332 | my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
@@ -350,13 +350,13 b' resolving manifests' | |||
|
350 | 350 | rev: versions differ -> m |
|
351 | 351 | preserving b for resolve of b |
|
352 | 352 | preserving rev for resolve of rev |
|
353 |
updat |
|
|
353 | updating: a 1/3 files (33.33%) | |
|
354 | 354 | removing a |
|
355 |
updat |
|
|
355 | updating: b 2/3 files (66.67%) | |
|
356 | 356 | picked tool 'python ../merge' for b (binary False symlink False) |
|
357 | 357 | merging b |
|
358 | 358 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
359 |
updat |
|
|
359 | updating: rev 3/3 files (100.00%) | |
|
360 | 360 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
361 | 361 | merging rev |
|
362 | 362 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
@@ -379,13 +379,13 b' resolving manifests' | |||
|
379 | 379 | rev: versions differ -> m |
|
380 | 380 | preserving b for resolve of b |
|
381 | 381 | preserving rev for resolve of rev |
|
382 |
updat |
|
|
382 | updating: a 1/3 files (33.33%) | |
|
383 | 383 | getting a |
|
384 |
updat |
|
|
384 | updating: b 2/3 files (66.67%) | |
|
385 | 385 | picked tool 'python ../merge' for b (binary False symlink False) |
|
386 | 386 | merging b |
|
387 | 387 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
388 |
updat |
|
|
388 | updating: rev 3/3 files (100.00%) | |
|
389 | 389 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
390 | 390 | merging rev |
|
391 | 391 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
@@ -409,13 +409,13 b' resolving manifests' | |||
|
409 | 409 | rev: versions differ -> m |
|
410 | 410 | preserving b for resolve of b |
|
411 | 411 | preserving rev for resolve of rev |
|
412 |
updat |
|
|
412 | updating: a 1/3 files (33.33%) | |
|
413 | 413 | removing a |
|
414 |
updat |
|
|
414 | updating: b 2/3 files (66.67%) | |
|
415 | 415 | picked tool 'python ../merge' for b (binary False symlink False) |
|
416 | 416 | merging b |
|
417 | 417 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
418 |
updat |
|
|
418 | updating: rev 3/3 files (100.00%) | |
|
419 | 419 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
420 | 420 | merging rev |
|
421 | 421 | my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
@@ -438,13 +438,13 b' resolving manifests' | |||
|
438 | 438 | rev: versions differ -> m |
|
439 | 439 | preserving b for resolve of b |
|
440 | 440 | preserving rev for resolve of rev |
|
441 |
updat |
|
|
441 | updating: a 1/3 files (33.33%) | |
|
442 | 442 | getting a |
|
443 |
updat |
|
|
443 | updating: b 2/3 files (66.67%) | |
|
444 | 444 | picked tool 'python ../merge' for b (binary False symlink False) |
|
445 | 445 | merging b |
|
446 | 446 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
447 |
updat |
|
|
447 | updating: rev 3/3 files (100.00%) | |
|
448 | 448 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
449 | 449 | merging rev |
|
450 | 450 | my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
@@ -467,11 +467,11 b' resolving manifests' | |||
|
467 | 467 | rev: versions differ -> m |
|
468 | 468 | preserving b for resolve of b |
|
469 | 469 | preserving rev for resolve of rev |
|
470 |
updat |
|
|
470 | updating: b 1/2 files (50.00%) | |
|
471 | 471 | picked tool 'python ../merge' for b (binary False symlink False) |
|
472 | 472 | merging b |
|
473 | 473 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
|
474 |
updat |
|
|
474 | updating: rev 2/2 files (100.00%) | |
|
475 | 475 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
476 | 476 | merging rev |
|
477 | 477 | my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
@@ -497,13 +497,13 b' use (c)hanged version or leave (d)eleted' | |||
|
497 | 497 | a: prompt recreating -> g |
|
498 | 498 | preserving b for resolve of b |
|
499 | 499 | preserving rev for resolve of rev |
|
500 |
updat |
|
|
500 | updating: a 1/3 files (33.33%) | |
|
501 | 501 | getting a |
|
502 |
updat |
|
|
502 | updating: b 2/3 files (66.67%) | |
|
503 | 503 | picked tool 'python ../merge' for b (binary False symlink False) |
|
504 | 504 | merging b |
|
505 | 505 | my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
|
506 |
updat |
|
|
506 | updating: rev 3/3 files (100.00%) | |
|
507 | 507 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
508 | 508 | merging rev |
|
509 | 509 | my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
@@ -529,12 +529,12 b' use (c)hanged version or (d)elete? c' | |||
|
529 | 529 | rev: versions differ -> m |
|
530 | 530 | preserving b for resolve of b |
|
531 | 531 | preserving rev for resolve of rev |
|
532 |
updat |
|
|
533 |
updat |
|
|
532 | updating: a 1/3 files (33.33%) | |
|
533 | updating: b 2/3 files (66.67%) | |
|
534 | 534 | picked tool 'python ../merge' for b (binary False symlink False) |
|
535 | 535 | merging b |
|
536 | 536 | my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
|
537 |
updat |
|
|
537 | updating: rev 3/3 files (100.00%) | |
|
538 | 538 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
539 | 539 | merging rev |
|
540 | 540 | my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
@@ -563,11 +563,11 b' resolving manifests' | |||
|
563 | 563 | preserving a for resolve of b |
|
564 | 564 | preserving rev for resolve of rev |
|
565 | 565 | removing a |
|
566 |
updat |
|
|
566 | updating: a 1/2 files (50.00%) | |
|
567 | 567 | picked tool 'python ../merge' for b (binary False symlink False) |
|
568 | 568 | merging a and b to b |
|
569 | 569 | my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
|
570 |
updat |
|
|
570 | updating: rev 2/2 files (100.00%) | |
|
571 | 571 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
572 | 572 | merging rev |
|
573 | 573 | my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
@@ -595,11 +595,11 b' resolving manifests' | |||
|
595 | 595 | rev: versions differ -> m |
|
596 | 596 | preserving b for resolve of b |
|
597 | 597 | preserving rev for resolve of rev |
|
598 |
updat |
|
|
598 | updating: b 1/2 files (50.00%) | |
|
599 | 599 | picked tool 'python ../merge' for b (binary False symlink False) |
|
600 | 600 | merging b and a to b |
|
601 | 601 | my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
602 |
updat |
|
|
602 | updating: rev 2/2 files (100.00%) | |
|
603 | 603 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
604 | 604 | merging rev |
|
605 | 605 | my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
@@ -630,14 +630,14 b' resolving manifests' | |||
|
630 | 630 | c: remote created -> g |
|
631 | 631 | preserving b for resolve of b |
|
632 | 632 | preserving rev for resolve of rev |
|
633 |
updat |
|
|
633 | updating: b 1/3 files (33.33%) | |
|
634 | 634 | picked tool 'python ../merge' for b (binary False symlink False) |
|
635 | 635 | merging b and a to b |
|
636 | 636 | my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
|
637 | 637 | premerge successful |
|
638 |
updat |
|
|
638 | updating: c 2/3 files (66.67%) | |
|
639 | 639 | getting c |
|
640 |
updat |
|
|
640 | updating: rev 3/3 files (100.00%) | |
|
641 | 641 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
642 | 642 | merging rev |
|
643 | 643 | my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
@@ -83,7 +83,7 b' resolving manifests' | |||
|
83 | 83 | overwrite None partial False |
|
84 | 84 | ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4 |
|
85 | 85 | .hgsubstate: versions differ -> m |
|
86 |
updat |
|
|
86 | updating: .hgsubstate 1/1 files (100.00%) | |
|
87 | 87 | subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
|
88 | 88 | subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
|
89 | 89 | getting subrepo t |
@@ -91,7 +91,7 b' resolving manifests' | |||
|
91 | 91 | overwrite True partial False |
|
92 | 92 | ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a |
|
93 | 93 | t: remote is newer -> g |
|
94 |
updat |
|
|
94 | updating: t 1/1 files (100.00%) | |
|
95 | 95 | getting t |
|
96 | 96 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 | 97 | (branch merge, don't forget to commit) |
@@ -107,7 +107,7 b' resolving manifests' | |||
|
107 | 107 | overwrite None partial False |
|
108 | 108 | ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf |
|
109 | 109 | .hgsubstate: versions differ -> m |
|
110 |
updat |
|
|
110 | updating: .hgsubstate 1/1 files (100.00%) | |
|
111 | 111 | subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
|
112 | 112 | subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
|
113 | 113 | merging subrepo t |
@@ -117,7 +117,7 b' resolving manifests' | |||
|
117 | 117 | ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 |
|
118 | 118 | t: versions differ -> m |
|
119 | 119 | preserving t for resolve of t |
|
120 |
updat |
|
|
120 | updating: t 1/1 files (100.00%) | |
|
121 | 121 | picked tool 'internal:merge' for t (binary False symlink False) |
|
122 | 122 | merging t |
|
123 | 123 | my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
@@ -24,11 +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 |
updat |
|
|
27 | updating: a 1/2 files (50.00%) | |
|
28 | 28 | picked tool 'true' for a (binary False symlink False) |
|
29 | 29 | merging a |
|
30 | 30 | my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
|
31 |
updat |
|
|
31 | updating: b 2/2 files (100.00%) | |
|
32 | 32 | getting b |
|
33 | 33 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
34 | 34 | changeset: 1:802f095af299 |
@@ -43,9 +43,9 b' resolving manifests' | |||
|
43 | 43 | a: versions differ -> m |
|
44 | 44 | b: other deleted -> r |
|
45 | 45 | preserving a for resolve of a |
|
46 |
updat |
|
|
46 | updating: b 1/2 files (50.00%) | |
|
47 | 47 | removing b |
|
48 |
updat |
|
|
48 | updating: a 2/2 files (100.00%) | |
|
49 | 49 | picked tool 'true' for a (binary False symlink False) |
|
50 | 50 | merging a |
|
51 | 51 | my a@802f095af299+ other a@33aaa84a386b ancestor a@802f095af299 |
@@ -71,11 +71,11 b' resolving manifests' | |||
|
71 | 71 | a: versions differ -> m |
|
72 | 72 | b: remote created -> g |
|
73 | 73 | preserving a for resolve of a |
|
74 |
updat |
|
|
74 | updating: a 1/2 files (50.00%) | |
|
75 | 75 | picked tool 'true' for a (binary False symlink False) |
|
76 | 76 | merging a |
|
77 | 77 | my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b |
|
78 |
updat |
|
|
78 | updating: b 2/2 files (100.00%) | |
|
79 | 79 | getting b |
|
80 | 80 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
81 | 81 | changeset: 1:802f095af299 |
@@ -128,11 +128,11 b' resolving manifests' | |||
|
128 | 128 | b: versions differ -> m |
|
129 | 129 | preserving a for resolve of a |
|
130 | 130 | preserving b for resolve of b |
|
131 |
updat |
|
|
131 | updating: a 1/2 files (50.00%) | |
|
132 | 132 | picked tool 'true' for a (binary False symlink False) |
|
133 | 133 | merging a |
|
134 | 134 | my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b |
|
135 |
updat |
|
|
135 | updating: b 2/2 files (100.00%) | |
|
136 | 136 | picked tool 'true' for b (binary False symlink False) |
|
137 | 137 | merging b |
|
138 | 138 | my b@802f095af299+ other b@030602aee63d ancestor b@000000000000 |
@@ -46,11 +46,11 b' resolving manifests' | |||
|
46 | 46 | side2: other deleted -> r |
|
47 | 47 | side1: other deleted -> r |
|
48 | 48 | main: remote created -> g |
|
49 |
updat |
|
|
49 | updating: side1 1/3 files (33.33%) | |
|
50 | 50 | removing side1 |
|
51 |
updat |
|
|
51 | updating: side2 2/3 files (66.67%) | |
|
52 | 52 | removing side2 |
|
53 |
updat |
|
|
53 | updating: main 3/3 files (100.00%) | |
|
54 | 54 | getting main |
|
55 | 55 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
56 | 56 | Should only show a main |
General Comments 0
You need to be logged in to leave comments.
Login now