[MERGE] auto-resolve for commit

[John Arbash Meinel]

Aaron Bentley wrote:
> Hi all,
> 
> I've gotten sick on being pestered to mark conflicts as resolved.  And I
> don't like running 'resolve --all', because it disables a safeguard.
> 
> So here's auto_resolve.  It marks text conflicts as resolved at commit
> time, if the corresponding file has no conflict markers.  But if it
> does, you must either edit the file to remove the marker, or manually
> mark the file as resolved (if the conflict marker is really supposed to
> be there.)
> 
> That way, no one has to run resolve --all (99% of the time), but you
> still get all the safety Bazaar already provides.
> 
> Aaron


I'm not sure about auto resolving on commit. However, I think a 'bzr
resolve --check' would be a very good place for this. Actually, I would
even consider 'bzr resolve --all' should actually perform this check.
While 'bzr resolve foo/bar' would sledgehammer that the conflict is
resolved.

Further, I think you could use the regex:

'^(<{7}|={7}|>{7})'

That would prevent NEWS from always failing the check. (NEWS has an
entry describing when we added <<< lines to conflicts.)

The only place where we would get messed up would be:
https://launchpad.net/products/bzr/+bug/36399

But we should fix that bug anyway.

John
=:->

-------------- 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/20061106/dc9d55b6/attachment.pgp