Patchwork [5,of,5,V4] graft: customize graft conflict markers (BC)

login
register
mail settings
Submitter Durham Goode
Date May 15, 2014, 8:52 p.m.
Message ID <742dbe5363429a31bc6b.1400187162@dev2000.prn2.facebook.com>
Download mbox | patch
Permalink /patch/4758/
State Superseded
Commit 559f01f19cf6b8054f010e51c0c958157e617f8b
Headers show

Comments

Durham Goode - May 15, 2014, 8:52 p.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1399684502 25200
#      Fri May 09 18:15:02 2014 -0700
# Node ID 742dbe5363429a31bc6b34ba2183da805254f786
# Parent  bb62c44b762c45dd6fdd0bbd0b322e12023d0005
graft: customize graft conflict markers (BC)

Changes the graft conflict markers to be 'graft' and 'local' to make it
more intuitive which side is which.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3185,7 +3185,7 @@ 
                     repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
                                       'graft')
                     stats = mergemod.update(repo, ctx.node(), True, True, False,
-                                            ctx.p1().node())
+                        ctx.p1().node(), labels=['local', 'graft'])
                 finally:
                     repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
                 # report any conflicts