[MERGE] auto-resolve for commit
robey at lag.net
Fri Nov 10 19:17:05 GMT 2006
On 7 Nov 2006, at 22:15, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 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.
It would be nice if a plain
$ bzr resolved
would do that conflicts() step but not do anything else, so that if I
have fixed all the conflicts in my editor, I can just do
$ bzr resolved && bzr commit
to clear out the conflict list and commit.
More information about the bazaar