Comment 15 for bug 653307

Martin Pool wrote:
> I'm curious what the differences are between the inventories, and if
> there are file differences do they say they were changed in this
> revision?

So here's some more details about
<email address hidden> of the diffutils package
import branches for debian squeeze vs. debian sid.

6 files have different contents:

debian/changelog
debian/control
debian/rules
debian/copyright
config.guess
config.sub

Let's take a closer look at say debian/control (just because it's the smallest
file). First the boring bits, the parts the inventories agree on:

  file-id: control-20090616020227-q98q6yzybj4rvrua-209
  parent file-id: debian-20090616020227-q98q6yzybj4rvrua-207
  name in parent: control

Now here's what one repo thinks for the rest:

  revision: <email address hidden>
  sha-1: 16b4c3b1659e4ac76332e47c2934a3174d516e07
  size: 997

But here's what another repo thinks:

  revision: <email address hidden>
  sha-1: 1f6e1c1b6a0b5d2b7970ff8ea1046e17dfefcc89
  size: 1320

Now I see something interesting there: the file-revision in one of them has an
embedded date newer than the inventory's own embedded date (2009-09-08 >
2009-05-29). But then, so does the file-id, which apparently isn't
contentious...

Another point of interest is that the sid branch contains one revision, and is
stacked on the squeeze branch, which has 5 revisions (no revisions in common).
The 1 inventory in common is the one copied across the stacking boundary, the
parent of the other inventory in sid!

So perhaps this is or was due to a stacking bug. I wonder if it's a fixed one?