Show More
@@ -415,14 +415,15 b' def manifestmerge(repo, wctx, p2, pa, br' | |||||
415 | if partial and not partial(f): |
|
415 | if partial and not partial(f): | |
416 | continue |
|
416 | continue | |
417 | if n1 and n2: |
|
417 | if n1 and n2: | |
418 |
if |
|
418 | if f not in ma: | |
419 | fa = f |
|
419 | # Note: f as ancestor is wrong - we can't really make a 3-way | |
420 | a = ma.get(f, nullid) |
|
420 | # merge without an ancestor file. | |
421 |
|
|
421 | fa = copy.get(f, f) | |
422 | fa = copy.get(f, f) |
|
422 | actions['m'].append((f, (f, f, fa, False, pa.node()), | |
423 | # Note: f as default is wrong - we can't really make a 3-way |
|
423 | "both created")) | |
424 | # merge without an ancestor file. |
|
424 | else: | |
425 |
|
|
425 | a = ma[f] | |
|
426 | fla = ma.flags(f) | |||
426 | nol = 'l' not in fl1 + fl2 + fla |
|
427 | nol = 'l' not in fl1 + fl2 + fla | |
427 | if n2 == a and fl2 == fla: |
|
428 | if n2 == a and fl2 == fla: | |
428 | actions['k'].append((f, (), "keep")) # remote unchanged |
|
429 | actions['k'].append((f, (), "keep")) # remote unchanged | |
@@ -436,7 +437,7 b' def manifestmerge(repo, wctx, p2, pa, br' | |||||
436 | elif nol and n1 == a: # local only changed 'x' |
|
437 | elif nol and n1 == a: # local only changed 'x' | |
437 | actions['g'].append((f, (fl1,), "remote is newer")) |
|
438 | actions['g'].append((f, (fl1,), "remote is newer")) | |
438 | else: # both changed something |
|
439 | else: # both changed something | |
439 |
actions['m'].append((f, (f, f, f |
|
440 | actions['m'].append((f, (f, f, f, False, pa.node()), | |
440 | "versions differ")) |
|
441 | "versions differ")) | |
441 | elif f in copied: # files we'll deal with on m2 side |
|
442 | elif f in copied: # files we'll deal with on m2 side | |
442 | pass |
|
443 | pass |
@@ -343,7 +343,7 b' args:' | |||||
343 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
|
343 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 | |
344 | preserving b for resolve of b |
|
344 | preserving b for resolve of b | |
345 | preserving rev for resolve of rev |
|
345 | preserving rev for resolve of rev | |
346 | b: versions differ -> m |
|
346 | b: both created -> m | |
347 | updating: b 1/2 files (50.00%) |
|
347 | updating: b 1/2 files (50.00%) | |
348 | picked tool 'python ../merge' for b (binary False symlink False) |
|
348 | picked tool 'python ../merge' for b (binary False symlink False) | |
349 | merging b |
|
349 | merging b | |
@@ -413,7 +413,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
413 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
|
413 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 | |
414 | preserving b for resolve of b |
|
414 | preserving b for resolve of b | |
415 | preserving rev for resolve of rev |
|
415 | preserving rev for resolve of rev | |
416 | b: versions differ -> m |
|
416 | b: both created -> m | |
417 | updating: b 1/2 files (50.00%) |
|
417 | updating: b 1/2 files (50.00%) | |
418 | picked tool 'python ../merge' for b (binary False symlink False) |
|
418 | picked tool 'python ../merge' for b (binary False symlink False) | |
419 | merging b |
|
419 | merging b | |
@@ -446,7 +446,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
446 | a: other deleted -> r |
|
446 | a: other deleted -> r | |
447 | removing a |
|
447 | removing a | |
448 | updating: a 1/3 files (33.33%) |
|
448 | updating: a 1/3 files (33.33%) | |
449 | b: versions differ -> m |
|
449 | b: both created -> m | |
450 | updating: b 2/3 files (66.67%) |
|
450 | updating: b 2/3 files (66.67%) | |
451 | picked tool 'python ../merge' for b (binary False symlink False) |
|
451 | picked tool 'python ../merge' for b (binary False symlink False) | |
452 | merging b |
|
452 | merging b | |
@@ -478,7 +478,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
478 | a: remote is newer -> g |
|
478 | a: remote is newer -> g | |
479 | getting a |
|
479 | getting a | |
480 | updating: a 1/3 files (33.33%) |
|
480 | updating: a 1/3 files (33.33%) | |
481 | b: versions differ -> m |
|
481 | b: both created -> m | |
482 | updating: b 2/3 files (66.67%) |
|
482 | updating: b 2/3 files (66.67%) | |
483 | picked tool 'python ../merge' for b (binary False symlink False) |
|
483 | picked tool 'python ../merge' for b (binary False symlink False) | |
484 | merging b |
|
484 | merging b | |
@@ -511,7 +511,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
511 | a: other deleted -> r |
|
511 | a: other deleted -> r | |
512 | removing a |
|
512 | removing a | |
513 | updating: a 1/3 files (33.33%) |
|
513 | updating: a 1/3 files (33.33%) | |
514 | b: versions differ -> m |
|
514 | b: both created -> m | |
515 | updating: b 2/3 files (66.67%) |
|
515 | updating: b 2/3 files (66.67%) | |
516 | picked tool 'python ../merge' for b (binary False symlink False) |
|
516 | picked tool 'python ../merge' for b (binary False symlink False) | |
517 | merging b |
|
517 | merging b | |
@@ -543,7 +543,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
543 | a: remote is newer -> g |
|
543 | a: remote is newer -> g | |
544 | getting a |
|
544 | getting a | |
545 | updating: a 1/3 files (33.33%) |
|
545 | updating: a 1/3 files (33.33%) | |
546 | b: versions differ -> m |
|
546 | b: both created -> m | |
547 | updating: b 2/3 files (66.67%) |
|
547 | updating: b 2/3 files (66.67%) | |
548 | picked tool 'python ../merge' for b (binary False symlink False) |
|
548 | picked tool 'python ../merge' for b (binary False symlink False) | |
549 | merging b |
|
549 | merging b | |
@@ -574,7 +574,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
574 | preserving b for resolve of b |
|
574 | preserving b for resolve of b | |
575 | preserving rev for resolve of rev |
|
575 | preserving rev for resolve of rev | |
576 | a: keep -> k |
|
576 | a: keep -> k | |
577 | b: versions differ -> m |
|
577 | b: both created -> m | |
578 | updating: b 1/2 files (50.00%) |
|
578 | updating: b 1/2 files (50.00%) | |
579 | picked tool 'python ../merge' for b (binary False symlink False) |
|
579 | picked tool 'python ../merge' for b (binary False symlink False) | |
580 | merging b |
|
580 | merging b | |
@@ -609,7 +609,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
609 | a: prompt recreating -> g |
|
609 | a: prompt recreating -> g | |
610 | getting a |
|
610 | getting a | |
611 | updating: a 1/3 files (33.33%) |
|
611 | updating: a 1/3 files (33.33%) | |
612 | b: versions differ -> m |
|
612 | b: both created -> m | |
613 | updating: b 2/3 files (66.67%) |
|
613 | updating: b 2/3 files (66.67%) | |
614 | picked tool 'python ../merge' for b (binary False symlink False) |
|
614 | picked tool 'python ../merge' for b (binary False symlink False) | |
615 | merging b |
|
615 | merging b | |
@@ -643,7 +643,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
643 | preserving rev for resolve of rev |
|
643 | preserving rev for resolve of rev | |
644 | a: prompt keep -> a |
|
644 | a: prompt keep -> a | |
645 | updating: a 1/3 files (33.33%) |
|
645 | updating: a 1/3 files (33.33%) | |
646 | b: versions differ -> m |
|
646 | b: both created -> m | |
647 | updating: b 2/3 files (66.67%) |
|
647 | updating: b 2/3 files (66.67%) | |
648 | picked tool 'python ../merge' for b (binary False symlink False) |
|
648 | picked tool 'python ../merge' for b (binary False symlink False) | |
649 | merging b |
|
649 | merging b |
@@ -188,7 +188,7 b' create a second head' | |||||
188 | picked tool 'true' for a (binary False symlink False) |
|
188 | picked tool 'true' for a (binary False symlink False) | |
189 | merging a |
|
189 | merging a | |
190 | my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a |
|
190 | my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a | |
191 | b: versions differ -> m |
|
191 | b: both created -> m | |
192 | updating: b 2/2 files (100.00%) |
|
192 | updating: b 2/2 files (100.00%) | |
193 | picked tool 'true' for b (binary False symlink False) |
|
193 | picked tool 'true' for b (binary False symlink False) | |
194 | merging b |
|
194 | merging b |
General Comments 0
You need to be logged in to leave comments.
Login now