Russ Allbery <r...@debian.org> writes: > After building with dgit --quilt=gbp sbuild, dgit --quilt=gbp push also > fails:
dgit --gbp quilt-fixup makes things get farther, but then I get: $ dgit --quilt=gbp push --overwrite canonical suite name for unstable is sid downloading http://ftp.debian.org/debian//pool/main/r/rssh/rssh_2.3.4-5.dsc... last upload to archive: NO git hash warning: ignoring broken ref refs/remotes/origin/HEAD warning: ignoring broken ref refs/remotes/origin/HEAD using existing rssh_2.3.4.orig.tar.gz using existing rssh_2.3.4-5.debian.tar.xz dpkg-source: info: extracting rssh in rssh-2.3.4 dpkg-source: info: unpacking rssh_2.3.4.orig.tar.gz dpkg-source: info: unpacking rssh_2.3.4-5.debian.tar.xz warning: dgit: gbp-pq import and dpkg-source disagree! dgit: gbp-pq import gave commit 4bcb39f2b33aa6bfe48558e64d463105772269e8 dgit: gbp-pq import gave tree 05de3a2af940284657488e11993b499d6485c958 dgit: dpkg-source --before-build gave tree d3988675f3946c26c08b1c320be4b455e8237807 dgit: trying slow absurd-git-apply... synthesised git commit from .dsc 2.3.4-5 Format `3.0 (quilt)', need to check/update patch stack dgit: split brain (separate dgit view) may be needed (--quilt=gbp). dgit view: found cached (commit id 6c17b3f703403c011250841cff885527f05ab49b) Checking package changelog for archive version 2.3.4-5 ... Declaring that HEAD inciudes all changes in 2.3.4-5... Made pseudo-merge of 2.3.4-5 into dgit view. checking that rssh_2.3.4-6.dsc corresponds to HEAD dpkg-source: warning: extracting unsigned source package (../../../../rssh_2.3.4-6.dsc) dpkg-source: info: extracting rssh in rssh-2.3.4 dpkg-source: info: unpacking rssh_2.3.4.orig.tar.gz dpkg-source: info: unpacking rssh_2.3.4-6.debian.tar.xz dpkg-source: info: applying 0001-Fix-invalid-option-error.patch dpkg-source: info: applying 0002-Honor-CFLAGS-CPPFLAGS-passed-to-configure.patch dpkg-source: info: applying 0003-Fix-buffer-allocation-buffer-for-fail-message.patch dpkg-source: info: applying 0004-Lower-syslog-priority-to-debug.patch dpkg-source: info: applying 0005-Fix-spelling-errors-in-manual-pages.patch dpkg-source: info: applying 0006-Fixes-and-improvements-to-mkchroot.sh.patch dpkg-source: info: applying 0007-Handle-rsync-v3-e-protocol-option.patch dpkg-source: info: applying 0008-Add-support-for-Subversion-svnserve.patch dgit: HEAD specifies a different tree to rssh_2.3.4-6.dsc: dgit: conf_convert | 0 dgit: 1 file changed, 0 insertions(+), 0 deletions(-) dgit: Perhaps you forgot to build. Or perhaps there is a problem with your dgit: source tree (see dgit(7) for some hints). To see a full diff, run dgit: git diff dc66d4bce760602ff12f5894baaf931caa2c01fa HEAD ! Push failed, while preparing your push. ! You can retry the push, after fixing the problem, if you like. It really feels like something is broken with the interpretation of patches-unapplied 3.0 (quilt) trees. (conf_convert is a script added by one of the patches.) -- Russ Allbery (r...@debian.org) <http://www.eyrie.org/~eagle/>
