Patchwork [4,of,6,V5] graft: customize graft conflict markers (BC)

login
register
mail settings
Submitter Durham Goode
Date May 16, 2014, 11:48 p.m.
Message ID <072a8cf959e8e51fb800.1400284118@dev2000.prn2.facebook.com>
Download mbox | patch
Permalink /patch/4793/
State Accepted
Headers show

Comments

Durham Goode - May 16, 2014, 11:48 p.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1399684502 25200
#      Fri May 09 18:15:02 2014 -0700
# Node ID 072a8cf959e8e51fb8009313046cda87829454c2
# Parent  f0ed4cf79958ba61a23ba5d229e01d8b04b05545
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.
Pierre-Yves David - May 18, 2014, 8:27 a.m.
On 05/16/2014 04:48 PM, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham@fb.com>
> # Date 1399684502 25200
> #      Fri May 09 18:15:02 2014 -0700
> # Node ID 072a8cf959e8e51fb8009313046cda87829454c2
> # Parent  f0ed4cf79958ba61a23ba5d229e01d8b04b05545
> 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.
>
> 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'])

Guess what? Wrong indentation! I fixed it.

>                   finally:
>                       repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
>                   # report any conflicts

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