Mercurial > hg
changeset 23395:d9ebb475eede
merge: indent to prepare for next patch
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 24 Nov 2014 16:11:22 -0800 |
| parents | b5e2128ce9e6 |
| children | 6a254a2dd37c |
| files | mercurial/merge.py |
| diffstat | 1 files changed, 22 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Tue Nov 25 17:30:05 2014 -0600 +++ b/mercurial/merge.py Mon Nov 24 16:11:22 2014 -0800 @@ -415,28 +415,29 @@ if partial and not partial(f): continue if n1 and n2: - fa = f - a = ma.get(f, nullid) - if a == nullid: - fa = copy.get(f, f) - # Note: f as default is wrong - we can't really make a 3-way - # merge without an ancestor file. - fla = ma.flags(fa) - nol = 'l' not in fl1 + fl2 + fla - if n2 == a and fl2 == fla: - actions['k'].append((f, (), "keep")) # remote unchanged - elif n1 == a and fl1 == fla: # local unchanged - use remote - if n1 == n2: # optimization: keep local content + if True: + fa = f + a = ma.get(f, nullid) + if a == nullid: + fa = copy.get(f, f) + # Note: f as default is wrong - we can't really make a 3-way + # merge without an ancestor file. + fla = ma.flags(fa) + nol = 'l' not in fl1 + fl2 + fla + if n2 == a and fl2 == fla: + actions['k'].append((f, (), "keep")) # remote unchanged + elif n1 == a and fl1 == fla: # local unchanged - use remote + if n1 == n2: # optimization: keep local content + actions['e'].append((f, (fl2,), "update permissions")) + else: + actions['g'].append((f, (fl2,), "remote is newer")) + elif nol and n2 == a: # remote only changed 'x' actions['e'].append((f, (fl2,), "update permissions")) - else: - actions['g'].append((f, (fl2,), "remote is newer")) - elif nol and n2 == a: # remote only changed 'x' - actions['e'].append((f, (fl2,), "update permissions")) - elif nol and n1 == a: # local only changed 'x' - actions['g'].append((f, (fl1,), "remote is newer")) - else: # both changed something - actions['m'].append((f, (f, f, fa, False, pa.node()), - "versions differ")) + elif nol and n1 == a: # local only changed 'x' + actions['g'].append((f, (fl1,), "remote is newer")) + else: # both changed something + actions['m'].append((f, (f, f, fa, False, pa.node()), + "versions differ")) elif f in copied: # files we'll deal with on m2 side pass elif n1 and f in movewithdir: # directory rename, move local