merge of a -0ubuntu1 vs new upstream in Debian requires manual resolution of upstream diff

[Steve Langasek]

I was looking at doing a merge of a new upstream version of cryptsetup from Debian unstable. Merge base is 2:2.0.0-1, Ubuntu has 2:2.0.1-0ubuntu2, Debian has 2:2.0.2-1.

Trying to do a 'git rebase -i old/debian', I am presented with the entire upstream delta from 2.0.0 to 2.0.1 as part of the diff to break down into logical commits.

While this is a 3.0 (quilt) package and therefore I can be reasonably confident that everything not in the debian directory is part of the upstream delta and I could just commit it on that basis, a) I am not confident that doing this will result in a reasonable branch topology, and b) the tools should be smarter so I don't have to sift through this. In the case of a 1.0 format source package, this workflow seems to make the merge process harder rather than easier.