[MERGE] auto-resolve for commit

[Wouter van Heyst]

On Wed, Nov 08, 2006 at 01:15:24AM -0500, Aaron Bentley wrote:
> Martin Pool wrote:
> 
> > I don't think there should be a specific command; the point is to
> > eliminate a step.  How about instead:
> > 
> >   Commit fails if there are conflicts.
> > 
> >   The conflicts in a tree are taken from the tree's conflict list, 
> >   except that any text conflicts where the markers have been removed 
> >   are considered to be resolved.
> > 
> > This just requires WorkingTree.conflicts() to filter the list after it
> > reads it and everything else should just work(?)
> 
> It does change the performance characteristics of
> WorkingTree.conflicts(), and it will probably break some test cases, but
> if you think that's the right way forward, we can do it.
> 
> A side effect will be that 'resolve' will auto-resolve conflicts.

Aaron, did you get around to this? It looks like it would address all
concerns raised (well, perhaps not the performance one). I'd like to
merge this next week if possible.

Wouter van Heyst
http://thread.gmane.org/gmane.comp.version-control.bazaar-ng.general/19212
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 307 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061125/9ef9c7c9/attachment.pgp