[MERGE REVIEW]: weave merge conflict markers customizable, standards-compliant

[John A Meinel]

James Blackwell wrote:
> On Thu, Feb 23, 2006 at 10:20:02AM -0500, Aaron Bentley wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Hi all,
>>
>> Emacs smerge doesn't like our weave conflict markers because they don't
>> have a space after the seven '<' or '>' signs.  And they're less
>> friendly because they don't have labels.  This patch makes the markers
>> customizable, puts an extra space in the defaults, and customizes our
>> output to have the TREE and MERGE-SOURCE labels.
> 
>> +        return weave.weave_merge(plan, '<<<<<<< TREE\n', 
>> +                                       '>>>>>>> MERGE-SOURCE\n')
> 
> Would it be possible to call it "LOCAL" and "REMOTE" rather than TREE and
> MERGE-SOURCE? 
> 
> Otherwise, +1. 
> 

Well, TREE and MERGE-SOURCE are what we have merge3 using. So at a
minimum, I would like them to use the same labels.


diff3 defaults to using the full path to the file. I don't remember what
CVS uses anymore.

LOCAL & REMOTE are okay. We could also use the path to the branch
(probably just branch.base). Though you can merge within your own
branch, so it doesn't mean much. REMOTE isn't accurate either, but I
guess it does give the idea.

I think I might prefer THIS,BASE,OTHER

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060224/f7817e41/attachment.pgp