What we did at UBZ

[Martin Pool]

On 20 Nov 2005, John A Meinel <john at arbash-meinel.com> wrote:
> 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).

That is what I wanted too: you will be able to pull in the same cases as
now, but after the pull your revision-history has changed to be the
same as that of the parent.  To my mind this still does "convergence",
in that after being integrated you can get back onto the main branch.
It does put more emphasis on the left-hand parents and so means that we
can globally agree on a mainline leading up to any revision.

This is different to pull --overwrite in that it will only succeed if
there is a revision in the source that has merged the tip of the
branch, and also that it merges rather than cloberring the working
directory.

This is rather like baz's switch, and one could argue that this function
belongs under that name.  But I think it is useful to allow switching to
move to a branch that has not completely merged the destination, and
perhaps switch is more to do with the working directory than the branch.
-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051121/e7658d30/attachment.pgp