[patch] weave merge conflict scope improvement

[Martin Pool]

Robert Collins wrote:
> For this one it might be nice to have a result of
>         result = """\
>             start context
> <<<<<<< 
>             int a() {}
> =======
>             int b() {}
> =======
>             int c() {}
>             end context
>             """ 
> 
> Which is one of the output mode diff3 can generate.

Surely the middle block should be "a b c" not just b?

I agree it would be helpful.  I will look at making the WeaveMerge
return some kind of MergedText (or "ConflictedText"?) object which can
present conflicts in various ways, rather than collapsing it to text
strings in the merge itself.  That would also clean up the code that
does (if "<<<<<<< " in merge) into (if result.conflicts).

-- 
Martin

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