pull --overwrite

[John A Meinel]

Robey Pointer wrote:
> There was a discussion earlier in the week that "pull --overwrite"
> should cause a branch to contain the same revisions as the original, and
> pivot the revision-history to match the original also.  I just tried it
> (on my private branch of bzr.dev) and it didn't work.  Below is a
> shorter example.
> 
> robey

This has been done in my integration branch. "pull --overwrite" now has
tests for both the case when you have merged up-to-date, and when you
have merged, and have convergence (though I think the latter was already
handled).

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/20051201/37f308e6/attachment.pgp