Hi, Quoting Johannes Schauer (2015-10-10 20:34:40) > Quoting Ian Jackson (2015-10-10 18:07:02) > > You will need to tell dgit --deliberately-include-questionable-history > > because it doesn't know why the package was REJECTed and it wants to be > > told that it's not because of copyright problems (in which case ideally you > > would provide a differnet git history as well as a different package). > > Aha, so --deliberately-include-questionable-history is the knob I have to > turn. > That wasn't clear to me from the documentation before you told me to use it, > and reading the documentation again it is still not clear to me how that > option > works, why it exists and how it fixes my problem. > > From the context I assume that this option lets me do a `dgit push` even > though > I already pushed that exact same version? If so, then maybe this should be > mentioned in the description of the option? > > I was also wondering about why the mentioning of copyright and > redistributability reasons is important there. I can think of many other > reasons why there could be a REJECT after a dgit push including the one we > talked about in #800060 which was REJECTED because of a hash sum mismatch. > > So is --deliberately-include-questionable-history indeed the right option I > want to do a `dgit push` of a fixed .changes or .dsc file after a REJECTED > upload (assuming I didn't change anything of the packaging but just did a > rebuild with different options)?
I just so happened to have made the same mistake and used `dgit push` with a source-only .changes file even though the values of the Binaries field of the .changes and .dsc changed compared to the last version. Thus I got, again, a reject. So I tried using --deliberately-include-questionable-history when doing `dgit push` but this just results in: josch@hoothoot> dgit push --deliberately-include-questionable-history canonical suite name for unstable is sid downloading http://ftp.debian.org/debian//pool/main/f/fuzzylite/fuzzylite_5.1+dfsg-1.dsc... last upload to archive has NO git hash % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 1221k 100 1221k 0 0 2038k 0 --:--:-- --:--:-- --:--:-- 2042k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 12364 100 12364 0 0 105k 0 --:--:-- --:--:-- --:--:-- 106k dpkg-source: info: extracting fuzzylite in fuzzylite-5.1+dfsg dpkg-source: info: unpacking fuzzylite_5.1+dfsg.orig.tar.xz dpkg-source: info: unpacking fuzzylite_5.1+dfsg-1.debian.tar.xz dpkg-source: info: applying pkgconfig_installdir Format `3.0 (quilt)', checking/updating patch stack Format `3.0 (quilt)', checking/updating patch stack synthesised git commit from .dsc 5.1+dfsg-1 HEAD is now at f327338 release 5.1+dfsg-2 Version actually in archive: 5.1+dfsg-1 (older) Last allegedly pushed/uploaded: 5.1+dfsg-2 (newer or same) Perhaps the upload is stuck in incoming. Using the version from git. Format `3.0 (quilt)', checking/updating patch stack nothing quilty to commit, ok. checking that fuzzylite_5.1+dfsg-2.dsc corresponds to HEAD dpkg-source: warning: extracting unsigned source package (../../../../fuzzylite_5.1+dfsg-2.dsc) dpkg-source: info: extracting fuzzylite in fuzzylite-5.1+dfsg dpkg-source: info: unpacking fuzzylite_5.1+dfsg.orig.tar.xz dpkg-source: info: unpacking fuzzylite_5.1+dfsg-2.debian.tar.xz dpkg-source: info: applying pkgconfig_installdir Format `3.0 (quilt)', checking/updating patch stack Format `3.0 (quilt)', checking/updating patch stack You need a passphrase to unlock the secret key for user: "Johannes Schauer <jo...@mister-muffin.de>" 4096-bit RSA key, ID 8FBD83E1, created 2013-07-04 (main key ID CF4D3EB4) gpg: Signature made Mon 26 Oct 2015 11:07:58 AM CET using RSA key ID 8FBD83E1 gpg: Good signature from "Johannes Schauer <jo...@mister-muffin.de>" gpg: aka "Johannes Schauer <j.scha...@email.de>" gpg: aka "Johannes Schauer <jo...@debian.org>" To git+ssh://d...@push.dgit.debian.org/dgit/debian/repos/fuzzylite.git ! [rejected] debian/5.1+dfsg-2 -> debian/5.1+dfsg-2 (already exists) error: failed to push some refs to 'git+ssh://d...@push.dgit.debian.org/dgit/debian/repos/fuzzylite.git' hint: Updates were rejected because the tag already exists in the remote. dgit: failed command: git push 'git+ssh://d...@push.dgit.debian.org/dgit/debian/repos/fuzzylite.git' HEAD:refs/dgit/sid 'refs/tags/debian/5.1+dfsg-2' dgit: subprocess failed with error exit status 1 ! Push failed, while updating the remote git repository - see messages above. ! If you want to try again, you should use a new version number. So this doesn't seem to have worked. What is the right fix then? Thanks! cheers, josch
signature.asc
Description: signature