[MERGE] change set-pending-merges to set last_revision if that is not set.

Robert Collins robertc at robertcollins.net
Thu Aug 17 04:39:14 BST 2006


Hi, this patch changes the tree behaviour so that if last_revision is
None, set_pending_merges sets it - this gives us the more consistent
behaviour between working trees and revision trees w.r.t. parents.

I have not put in a guard against making the last-revision a ghost -
because the current API for doing that (set_last_revision) doesn't.
However, I have agreed with Aaron that the new API I'm doing -
set_parent_trees and set_parent_ids will have an explicit flag to say 'I
want the left most parent to be allowed to be a ghost'.

That patch will be coming along shortly, this one is the more intrusive
one - it changes the core behaviour, rather than changing the way we get
at the behaviour which is what the new API will do.

Cheers,
Rob



-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: set-pending-merges.patch
Type: text/x-patch
Size: 15775 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060817/afe0681f/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060817/afe0681f/attachment.pgp 


More information about the bazaar mailing list