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

login
register
mail settings
Submitter Durham Goode
Date May 13, 2014, 12:47 a.m.
Message ID <8f99fa164ba40c947d98.1399942057@dev2000.prn2.facebook.com>
Download mbox | patch
Permalink /patch/4730/
State Superseded
Headers show

Comments

Durham Goode - May 13, 2014, 12:47 a.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1399684502 25200
#      Fri May 09 18:15:02 2014 -0700
# Node ID 8f99fa164ba40c947d987eae4ba6afad46c35f2e
# Parent  2ca6a41546b166ca491537d85729fc3e9c42c01b
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