Merge proposal for branch-of-a-branch to trunk misses first branch's changes

[Ken Arnold]

I pushed some initial work to one branch, then kept developing and pushed to a different branch. I decided to propose merging the second branch to trunk because it was better tested. But the merge proposal page and email only includes the changes between the first and second branches -- far from all of the changes that would happen if someone merged my branch!

The merge proposal is https://code.launchpad.net/~kenneth-arnold/divisi/svdlibc-cleanup/+merge/14316

[Tim Penhey (thumper)]

In order for me to follow this up you need to also tell us the original branch.

[Ken Arnold (kenneth-arnold)]

Ah, right, it's not all accessible from that page.

Trunk: https://code.launchpad.net/~commonsense/divisi/trunk
First branch: https://code.launchpad.net/~kenneth-arnold/divisi/offset-svd
Second branch: https://code.launchpad.net/~kenneth-arnold/divisi/svdlibc-cleanup

[Tim Penhey (thumper)]

Why do you think that it isn't including the earlier changes?

[Ken Arnold (kenneth-arnold)]

The earliest changeset I see under "Unmerged Revisions" is 422. The latest revision on trunk is 408. The latest revision on the first branch (offset-svd) is 416.

The full diff includes the correct code. So maybe there are actually two bugs:
 (1) the "Unmerged Revisions" list is silently truncated, and
 (2) the diff included inline in the merge request email is silently truncated.

I hadn't noticed that the diff was _truncated_ before. The diff is big because we check in a generated file (because we don't want to require that people have the utility that generates it). Given limited email space, I'd much prefer that reviewers see a complete list of all files that were changed, vs. seeing a truncated diff. That might be a separate bug.

Thanks.

[Tim Penhey (thumper)]

Yes, there is a bug about the unmerged revisions only showing at most 10. Not sure on the bug id.

I don't think it is silently truncated. I'm pretty sure it says it is truncated. Can you attach the raw email text to this bug?

[Ken Arnold (kenneth-arnold)]

Hm, it seems that GMail was displaying the diff inline, and truncating it, both without informing me. Apologies for the noise; looks like this is just a dupe of that unmerged revisions bug.