[MERGE] auto-resolve for commit

[Wouter van Heyst]

On Mon, Nov 27, 2006 at 09:50:06AM -0500, Aaron Bentley wrote:
> Wouter van Heyst wrote:
> 
> >>Martin Pool wrote:
> >>
> >>
> >>>This just requires WorkingTree.conflicts() to filter the list after it
> >>>reads it and everything else should just work(?)
> 
> > 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.
> 
> I started to, and then I got uncomfortable with the implications, so I
> put it on the back burner.

Which implications made you uncomfortable?

Wouter van Heyst
-------------- 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/20061130/7c400aba/attachment.pgp