root-ids changing for some merges (was Re: [Merge] lp:~abentley/bzr/merge-into-empty into lp:bzr)

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 11-07-05 12:38 PM, vila wrote:
> The drawback that I just realized is that it breaks 'merge -r0..nn
> ../unrelated-branch' by forcing the new root which in turn trigger a
> rename for all existing children of the old root

That is the expected behaviour.  Could you explain why that is a drawback?

>     > Still, the new behaviour is in keeping with Merge's tendency of
>     > letting OTHER win in the case of ambiguity.
> 
> It shouldn't apply to root-ids

Why?

> but can be special-cased for the empty
> *branch*

The inputs to a three-way merge are the trees involved, so
special-casing based on branch is a surprising idea.  What do you have
in mind?

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEUEARECAAYFAk4TQpMACgkQ0F+nu1YWqI3dxACYyx+dQFKXDf+0a8obTc+zcvZZ
XwCeJOLu4at1zycswUsAYVQRvDzdN6U=
=zgj+
-----END PGP SIGNATURE-----