[rfc] pulling of new revisions after merge makes two branches identical?

[John Arbash Meinel]

Alexander Belchenko wrote:
> [bzr.exe 0.8.2]

...

> I.e. I faulty expect new main history as: A-C-D-F-H
> Instead I have new main history as: A-B-E-F-H
> 
> Is this intended behaviour or I miss something or this is a bug?
> I think, I remember that in older bzr versions this trick was impossible?
> 
> I think sometimes this behaviour is good, but sometimes -- not. And I
> cannot revert this pull operation and this last fact is the worst thing
> in this situation.
> 
> -- 
> Alexander
> 
> 

As Martin said, we used to allow you to maintain history, but now 'bzr
pull' also changes your history to be that of the other branch.

If you are able to get access to the old branch, you should be able to do:
bzr pull --overwrite old/branch
And then you can do
bzr merge new/branch
bzr commit

Rather than doing the new pull.

We may not fully implement it, but in theory you could do:
bzr pull --overwrite -r revid:theoneyouwant .
Which should reset your current tree, to something in the past.

The other option would be 'bzr uncommit -r revid:theoneyouwant', but I'm
pretty sure uncommit only works along the current history.

Can you try them, and file a bug report for not being able to specify
revisions which are not in your 'revision history'?
John
=:->

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