Show More
@@ -415,28 +415,29 b' def manifestmerge(repo, wctx, p2, pa, br' | |||
|
415 | 415 | if partial and not partial(f): |
|
416 | 416 | continue |
|
417 | 417 | if n1 and n2: |
|
418 |
f |
|
|
419 |
a = |
|
|
420 |
|
|
|
421 |
f |
|
|
422 | # Note: f as default is wrong - we can't really make a 3-way | |
|
423 | # merge without an ancestor file. | |
|
424 | fla = ma.flags(fa) | |
|
425 | nol = 'l' not in fl1 + fl2 + fla | |
|
426 |
|
|
|
427 | actions['k'].append((f, (), "keep")) # remote unchanged | |
|
428 | elif n1 == a and fl1 == fla: # local unchanged - use remote | |
|
429 | if n1 == n2: # optimization: keep local content | |
|
418 | if True: | |
|
419 | fa = f | |
|
420 | a = ma.get(f, nullid) | |
|
421 | if a == nullid: | |
|
422 | fa = copy.get(f, f) | |
|
423 | # Note: f as default is wrong - we can't really make a 3-way | |
|
424 | # merge without an ancestor file. | |
|
425 | fla = ma.flags(fa) | |
|
426 | nol = 'l' not in fl1 + fl2 + fla | |
|
427 | if n2 == a and fl2 == fla: | |
|
428 | actions['k'].append((f, (), "keep")) # remote unchanged | |
|
429 | elif n1 == a and fl1 == fla: # local unchanged - use remote | |
|
430 | if n1 == n2: # optimization: keep local content | |
|
431 | actions['e'].append((f, (fl2,), "update permissions")) | |
|
432 | else: | |
|
433 | actions['g'].append((f, (fl2,), "remote is newer")) | |
|
434 | elif nol and n2 == a: # remote only changed 'x' | |
|
430 | 435 | actions['e'].append((f, (fl2,), "update permissions")) |
|
431 | else: | |
|
432 |
actions['g'].append((f, (fl |
|
|
433 | elif nol and n2 == a: # remote only changed 'x' | |
|
434 |
actions[' |
|
|
435 | elif nol and n1 == a: # local only changed 'x' | |
|
436 | actions['g'].append((f, (fl1,), "remote is newer")) | |
|
437 | else: # both changed something | |
|
438 | actions['m'].append((f, (f, f, fa, False, pa.node()), | |
|
439 | "versions differ")) | |
|
436 | elif nol and n1 == a: # local only changed 'x' | |
|
437 | actions['g'].append((f, (fl1,), "remote is newer")) | |
|
438 | else: # both changed something | |
|
439 | actions['m'].append((f, (f, f, fa, False, pa.node()), | |
|
440 | "versions differ")) | |
|
440 | 441 | elif f in copied: # files we'll deal with on m2 side |
|
441 | 442 | pass |
|
442 | 443 | elif n1 and f in movewithdir: # directory rename, move local |
General Comments 0
You need to be logged in to leave comments.
Login now