Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 23482:208ec8ca7c79
merge: make 'keep' message more descriptive
Most merge action messages don't describe the action itself, they
describe the reason the action was taken. The only exeption is the 'k'
action, for which the message is just "keep" and instead there is a
code comment folling it that says "remote unchanged". Let's move that
comment into the merge action message.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 03 Dec 2014 14:03:20 -0800 |
| parents | 406dfc63a1ad |
| children | a1a7c94def6d |
line wrap: on
line diff
--- a/mercurial/merge.py Thu Dec 04 23:08:27 2014 -0500 +++ b/mercurial/merge.py Wed Dec 03 14:03:20 2014 -0800 @@ -427,7 +427,7 @@ fla = ma.flags(f) nol = 'l' not in fl1 + fl2 + fla if n2 == a and fl2 == fla: - actions['k'].append((f, (), "keep")) # remote unchanged + actions['k'].append((f, (), "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"))