[patch] weave merge conflict scope improvement
Aaron Bentley
aaron.bentley at utoronto.ca
Mon Mar 27 14:12:09 BST 2006
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Martin Pool wrote:
| 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).
That would be great. It would also make it easier to support
- --reprocess for weave merges.
Note: there's a tension between reprocess and show-base, because
reprocess obscures the relationship between BASE and conflict regions.
Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFEJ+Sp0F+nu1YWqI0RAlTsAJ9F4uUphfrM6RYcFMP97frNH+C3dwCffyEG
oKe7r8JT69UTcdQ4GB50L7Q=
=dDiG
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list