root-ids changing for some merges

[Aaron Bentley]

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

On 11-07-06 02:10 AM, vila wrote:
>>>>>> Aaron Bentley <aaron at aaronbentley.com> writes:

>     > I pointed
>     > this change out when I proposed the merge, so by approving the
>     > proposal, Jelmer approved the change in behaviour.
> 
> Neither the submitter nor the reviewer are required to be perfect,
> errors happen. And Jelmer wasn't involved, that was jam and me and none
> of us caught the issue.

I'm sorry if I was vague or misleading, but I really did try to bring it
to the reviewers' attention.  It's very strange to see it called an
unexpected behaviour now.

> But I'd rather continue to accept submissions
> and revert/fix them when needed than block them.
> 
>     > What's much more interesting is what behaviour do we want, and
>     > why?
> 
> The one we had was fine (bar the empty branch/tree merge bugs).

It's not helpful to repeat this without the *why*.

> I think both behaviors may be valid but we shouldn't switch if the new
> one introduce unwanted changes.

And again, what are the unwanted changes, as opposed to the expected and
deliberately introduced changes?

> Why the test suite didn't expose this in a
> more obvious way is another debate.

It's not ideal, but not very surprising.  Root ids are pretty
unimportant most of the time, and we tend to hide them.  For example, we
don't bother telling the user when a tree root is newly-added (i.e.
before the first commit).

>     > Okay, so there's bad UI consequences.
> 
> Yes and I'm saying they are bad enough to be fixed before we release
> 2.4b5. If we can't, then I'd rather revert this change.

This seems like an overreaction to me.  It is a beta, after all.  But I
will change the behaviour, and I expect it to be easy.

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

iEYEARECAAYFAk4UYqAACgkQ0F+nu1YWqI2jzQCdGqWkJscwrODyI+70+OxcmkFl
RiEAnijtNHdq9rL0dCwGHj3pSzH6j5H4
=PSZq
-----END PGP SIGNATURE-----