What we did at UBZ

[John A Meinel]

Aaron Bentley wrote:
> Jan Hudec wrote:
> |>If it's a merge, you won't be able to pull.
> |
> |
> | So please make it so that I will. It's OK if it requires an option to
> pull
> | (though I still don't see a reason why it should not be the default),
> | but --overwrite is clobbers too much.
> 
> What we're doing right now when you pull after being merged is "pull
> convergence", which we were talking about eliminating.  Are you saying
> you want to keep things the way they are, or that you want to do
> something different when you pull after a merge?

I believe he is saying that he wants pull convergence to turn into
"switch". So that if pull would converge, it just does a switch to the
latest revision in other. Which would rewrite the local revision-history
(if it exists).

John
=:->

> 
> Aaron

-------------- 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/20051120/cd572a3d/attachment.pgp