Ubuntu
qemu package

Code review comment for ~paelzer/ubuntu/+source/qemu:merge-7.0-kinetic

  1. Git
  2. lp:~paelzer/ubuntu/+source/qemu
  3. merge-7.0-kinetic
  4. Merge into debian/sid
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Hmm, yeah git-ubuntu's detection of where branches have split was wrong and I had to recreate most things manually due to that.
Re-Checking all of them ...

lp1971315/new/debian is on 1:7.0+dfsg-7 - on import-tag - ok

lp1971315/old/debian is on 1:6.2+dfsg-2 - ok - same content, but not on import-tag
That is really odd - the wrong commit it is on is also from the importer.
It would make no content-difference but might be important for the commit history (which also worked fine, but who knows), so I'm retagging this one.
 + ff4a6930be...5ad2a7321f lp1971315/old/debian -> lp1971315/old/debian (forced update)

lp1971315/old/ubuntu is on 1:6.2+dfsg-2ubuntu8 - on import-tag - ok

reconstruct, split and logical were all fine content-wise, but all based on the former lp1971315/old/debian. I've rebased them for you as well.
 + b5e67debc9...0019bb330f lp1971315/logical/1%2.6.1+dfsg-0ubuntu8 -> lp1971315/logical/1%2.6.1+dfsg-0ubuntu8 (forced update)
 + 20b3cab272...c4ed62e5ef lp1971315/reconstruct/1%6.2+dfsg-2ubuntu8 -> lp1971315/reconstruct/1%6.2+dfsg-2ubuntu8 (forced update)
 + 5d5686c37a...da23e7b8b6 lp1971315/split/1%6.2+dfsg-2ubuntu8 -> lp1971315/split/1%6.2+dfsg-2ubuntu8 (forced update)

---

I was trying to check where this wrong commit came from (as it might also explain what made git-ubuntu merge go nuts). It is hiding :-) as it is not found by any of the following oO
$ git branch -a --contains ff4a6930be
$ git tag --contains ff4a6930be
$ for r in $(git remote -v | cut -f 1 | uniq); do echo "$r"; git fetch $r ff4a6930be; done

Tracking its log, it seems it split off from correctly tagged ones on pkg/import/1%5.0-13 which is the last import tag in its history. All later commits are still git-ubuntu imports but without an import-tag.
I found via git "stash clear + reflog expire + fsck --unreachable + gc " that it was a non-cleared reference reachable from a git stash (an fsck before stash-clear/reflog-expire didn't clean it) that I had around from long ago.

After that clearing it LGTM now, just one 1:6.2+dfsg-2 and that is the right one :-)
Git-ubuntu might have searched for a matching treeish and picked the wrong one - maybe that cleanup allows my next merge to work out of the box?

« Back to merge proposal