Hello again, Martin Pitt [2015-02-17 9:55 +0100]: > Ah indeed, most upstream updates have a "Merge tag 'upstream/XXX' into > experimental" after "Imported Upstream version XXX", but 217 doesn't. > Probably I already had some trouble with this in 218, as curiously the > 218 update has two identically-looking commits 99af89298 and > f47781d88. > > So I suppose something went wrong with importing 217.
Mystery resolved. This happens when you git-import-orig a new release, then hack on the branch to port patches, resolve regressions, update packaging etc., and do a "git rebase -i origin" to clean up your work before pushing. That drops the above "Merge tag ... into ..." commits, and thus they disappear from the history. I now retroactively did that with git merge -s ours upstream/217 git merge -s ours upstream/218 (which are "null merges"), pushed that, and now git-import-orig is happy again. This is mostly for documentation for other people falling into the same trap now. Thanks, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
