partial commit with conflicts

[John Arbash Meinel]

I'm working on doing some refactoring, and it causes quite a few
conflicts. In the process, I would like to be able to commit the few
things as I am able to resolve them. For example, I merged another tree,
 and I want to commit 'bzrlib/builtins.py' because I fixed it, but I
didn't want to wait until I resolved all of the other conflicts (because
some of them will be rather involved).

I'm just wondering what repercussions this would cause, and whether we
want to support it at all. (Right now I'm not sure that we allow partial
commit when you have pending-merges either).

I can understand the need to have everything resolved so that the merge
operator knows that everything was fixed. (Otherwise you would end up
with some files that don't get the proper ancestry).

Anyway, just something I was trying to do, and wondering if anyone
thinks it might be worth implementing.

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/20060521/33631521/attachment.pgp