[PATCH 5 of 5] rebase: specify custom conflict marker labels for rebase

Durham Goode durham at fb.com
Fri May 9 13:55:34 CDT 2014


On 5/9/14, 3:42 AM, "Mads Kiilerich" <mads at kiilerich.com> wrote:

>On 05/09/2014 02:33 AM, Durham Goode wrote:
>> # HG changeset patch
>> # User Durham Goode <durham at fb.com>
>> # Date 1399593356 25200
>> #      Thu May 08 16:55:56 2014 -0700
>> # Node ID 375164d1425477d42f9d5c032465d79727648b17
>> # Parent  75ff3fc095cae6dcf513d424b7abb23121cc7e55
>> rebase: specify custom conflict marker labels for rebase
>>
>> Changes rebase conflict markers to say 'source' and 'destination'
>>instead of
>> 'local' and 'other'.  This ends up looking like:
>>
>>    one
>>    <<<<<<< destination: a3e5  master - "A commit to master"
>>    master
>>    =======
>>    mine
>>    >>>>>>> source: c7fd  - "A commit to my feature branch"
>>    three
>
>The revisions to rebase can be specified as source, base or revisions.
>Calling it source in all cases could perhaps be a bit confusing.
>Alternatives could be "original" or "rebasing" ... but source is
>probably better...

Base and revisions make very little sense, even within the context of the
rebase command (I explain -b to our new employees as Œdash bookmark¹
because base is meaningless).  ³source² and ³destination² make sense in
all cases.  I¹ll try to figure out a shorter version of Œdestination¹ like
pierre-yves suggested.

>
>Whatever we call it, it would also be nice if it was consistent with
>what it is called in graft.

Will look into this.



More information about the Mercurial-devel mailing list