How to reject revisions, i.e. make them disappear from the missing list

[John Arbash Meinel]

Robert Collins wrote:
> On Fri, 2005-10-21 at 18:24 -0500, John A Meinel wrote:
> 
> 
>>That should undo the change which was introduced from 10 to 11. And it
>>should not remove the actual entry in the store, so it would appear that
>>you still have revision 11 in your ancestry.
> 
> 
> Being present in the store is not what makes revisions appear in the
> ancestry - its whether is in 'branch.get_ancestry(rev_id)'

Well there are 2 ways that something appears in ancestry. If it is in
branch.get_ancestry() which right now uses the inventory.weave's
parental lineage.

And then there is the actual revision <parents> tag, which eventually
traces through all of ancestry. In theory the two should be identical.
In practice they aren't because of ghost revisions.

But either way, "bzr merge -r 11..10" will remove the actual changes
added by 11 relative to 10, without removing the entry from the ancestry.

(I do believe there is no way to remove anything but the last commit
from ancestry.)

John
=:->

> 
> Rob

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051023/ba1780ef/attachment.pgp