What we did at UBZ

[Jan Hudec]

On Sun, Nov 20, 2005 at 12:31:27 -0500, Aaron Bentley wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> 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 am saying I want to do something different. Something in between what you
are doing now and what I understood you want to do.

If I understood correctly you (as bzr developers) said you want to only allow
pull when there were no commits to the destination at all, so that revision
history can be defined as chain of first parents.

And I say ok, let's define revision history as the chain of first parents,
but allow pull under the same condition as currently. That means if A merges
B, then B can pull and it's revision history will be replaced by A's (because
it would be implicit in the first parents and pull can't mess with that).

It means revision numbers would have to be assigned differently, but as
I understood in the thread about log only seeing revision history instead of
full ancestry, the goal is to assign revision numbers to all revisions in
order they were brought, so under that definition it would work.

As I said, I won't mind if an option is required, so the change in revision
history (and thus log output) does not come as surprise to newcommers.

-- 
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- 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/20051120/5ebd4804/attachment.pgp