Package: dgit
Version: 14.9

Hi, Reinhard.  I saw this failure.  I think it's due to an unhelpful
behaviour by the tag2upload system (and dgit).

Debian tag2upload service writes ("[tag2upload 3016] irrecoverable 
golang-github-containers-image 5.39.1-1"):
> version: 5.39.1-1
...
> target: debian experimental
...
> Package not found in the archive, but has allegedly been pushed using dgit.
> Perhaps the upload is stuck in incoming.  Using the version from git.
> 
> dgit: split brain (separate dgit view) may be needed (--quilt=gbp).
> dgit view: found cached (commit id 0ab9021fbb5691ec9e43429b5e9994dc145994ea)
> Checking package changelog for archive version 5.38.0+ds2-1 ...
...
> dgit (build host): error: dgit (build host): error: missing field Version in 
> parsed changelog

The system is expecting that the changelog entry for the previous
upload to the same suite appears in the new upload.  That prevents
accidentally overwriting other people's changes (eg NMUs).

And, by "previous upload" it includes uploads that were done with git
(dgit or tag2upload) and then vanished from the legacy archive.  (One
reason for this is that the git history for any particular suite
should be fast forwarding.)

But, in combination, these rules aren't right for experimental.
I'm not sure what the right rules are.  One possibility is to say that
the version we should be checking for is the one in sid, if it's newer
than in experimental.

As for what you can do as a workaround:

One option is

  dgit fetch rc-buggy
  git merge -s ours dgit/dgit/rc-buggy

and then bump the changelog version, and then I think git-debpush
would succeed.  But you may not wish to include this extraneous stuff
in your git history.

Another option would be to run git-deborig and dgit push-source
locally.  You may need to write
  dgit --overwrite=5.38.0+ds2-1 push-source

Sorry for the inconvenience.

Ian.

PS: See also #1109584 which is about backports, which has a similar
kind of problem.  I haven't thought through the situation carefully
enough to know whether the same fix will work for both cases.

-- 
Ian Jackson <[email protected]>   These opinions are my own.  

Pronouns: they/he.  If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.

Reply via email to