Bug#841383: dgit: splitbrain push fails if package was previously pushed without splitbrain
Hello Ian,
On Thu, Oct 20, 2016 at 01:56:22PM +0100, Ian Jackson wrote:
> Control: severity -1 important
>
> Sean Whitton writes ("Bug#841383: dgit: splitbrain push fails if package was
> previously pushed without splitbrain"):
> > hephaestus ~/src/classic-theme-restorer % dgit --quilt=gbp push
> > canonical suite name for unstable is sid
>
> Thanks. I have reproduced this. Looking at the code, and at my own
> attempts, I don't understand how this passes its tests.
>
> I will get back to you.
Thanks for uploading a fix for this!
> I flailed about a bit trying to get gbp-buildpackage to DTRT to make
> me the .orig. It complained about the lack of a 1.5.8 tag. Looking
> through the history I guessed that the right answer was
> git-tag 1.5.8 9d6ae94c885280ebf269ca9e4eb0a162c47037b2
It looks like I failed to push the tags -- sorry about that.
However, as I mentioned in the original message, the tarball was
available on the pristine-tar branch (I don't normally push that branch,
but I did in this case, for the sake of this bug).
--
Sean Whitton
Bug#841383: dgit: splitbrain push fails if package was previously pushed without splitbrain
Ian Jackson writes ("Re: Bug#841383: dgit: splitbrain push fails if package was
previously pushed without splitbrain"):
> Sean Whitton writes ("Bug#841383: dgit: splitbrain push fails if package was
> previously pushed without splitbrain"):
...
> > warning: git fetch
> > +refs/tags/archive/debian/*:refs/dgit-fetch/sid/tags/archive/debian/*
> > +refs/tags/debian/*:refs/dgit-fetch/sid/tags/debian/*
> > +refs/dgit/sid:refs/dgit-fetch/sid/dgit/sid created
> > refs/dgit-fetch/sid/heads/master; this is silly, deleting it.
BTW I looked at this message and:
It is generated by dgit when it thinks git fetch has malfunctioned.
But actually, I think that ref was left over from a run of dgit 1.4 or
earlier, perhaps against the alioth repos.
So the message is harmless.
Ian.
--
Ian Jackson <ijack...@chiark.greenend.org.uk> These opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
Bug#841383: dgit: splitbrain push fails if package was previously pushed without splitbrain
Ian Jackson writes ("Re: Bug#841383: dgit: splitbrain push fails if package was
previously pushed without splitbrain"):
> Thanks. I have reproduced this. Looking at the code, and at my own
> attempts, I don't understand how this passes its tests.
>
> I will get back to you.
Now fixed in 2.4, I think. You probably need the other fixes in 2.4
too.
I'm afraid I decided that this fix was too important to wait for me to
finish integrating your manpage contributions, even though I'm sure it
won't take much longer.
Ian.
--
Ian Jackson <ijack...@chiark.greenend.org.uk> These opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
Bug#841383: dgit: splitbrain push fails if package was previously pushed without splitbrain
Control: severity -1 important
Sean Whitton writes ("Bug#841383: dgit: splitbrain push fails if package was
previously pushed without splitbrain"):
> hephaestus ~/src/classic-theme-restorer % dgit --quilt=gbp push
> canonical suite name for unstable is sid
Thanks. I have reproduced this. Looking at the code, and at my own
attempts, I don't understand how this passes its tests.
I will get back to you.
> `debcheckout classic-theme-restorer` will get you what I'm trying to
> push, if that helps, including a pristine-tar branch.
Thanks. FYI a reference to the specific git revisions would have been
helpful. I figured out that you probably meant "master"
(38f0bf714d3d23d969d31810a2fa5c2844d083b7).
I flailed about a bit trying to get gbp-buildpackage to DTRT to make
me the .orig. It complained about the lack of a 1.5.8 tag. Looking
through the history I guessed that the right answer was
git-tag 1.5.8 9d6ae94c885280ebf269ca9e4eb0a162c47037b2
Then
gbp buildpackage --git-cleaner=: --git-builder='debuild -nc -i -S'
was able to make me an orig tarball (which it did before crashing due
to lack of access to my private key - apparently it wanted to make
a signature, which surprised me).
If the .orig is not unreasonably large, it would save me effort if you
could provide it (under separate cover by email perhaps, or perhaps on
a separate webserver).
Thanks,
Ian.
--
Ian Jackson <ijack...@chiark.greenend.org.uk> These opinions are my own.
If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.
Bug#841383: dgit: splitbrain push fails if package was previously pushed without splitbrain
Sean Whitton writes ("Bug#841383: dgit: splitbrain push fails if package was
previously pushed without splitbrain"):
> Package: dgit
> Version: 2.3
> Severity: normal
>
> classic-theme-restorer is maintained in a team gbp repository. It
> didn't have any quilt patches before, so I'd made an upload using dgit.
> I just added a new quilt patch, and now I can't upload with --quilt=gbp.
>
> hephaestus ~/src/classic-theme-restorer % dgit --quilt=gbp push
^^^
> canonical suite name for unstable is sid
> warning: git fetch
> +refs/tags/archive/debian/*:refs/dgit-fetch/sid/tags/archive/debian/*
> +refs/tags/debian/*:refs/dgit-fetch/sid/tags/debian/*
> +refs/dgit/sid:refs/dgit-fetch/sid/dgit/sid created
> refs/dgit-fetch/sid/heads/master; this is silly, deleting it.
What ?!
> dgit: split brain (separate dgit view) may be needed (--quilt=gbp).
This message is slightly comedic in context.
> Use of uninitialized value $_ in pattern match (m//) at /usr/bin/dgit
> line 4364.
This is probably due to the git second-guessing above.
> On a second try, I get slightly different output:
>
> hephaestus ~/src/classic-theme-restorer % dgit --quilt=gbp push
> canonical suite name for unstable is sid
> downloading
> http://ftp.debian.org/debian//pool/main/c/classic-theme-restorer/classic-theme-restorer_1.5.7-1.dsc...
> last upload to archive specified git hash
> using existing classic-theme-restorer_1.5.7.orig.tar.xz
> Format `3.0 (quilt)', need to check/update patch stack
> dgit: split brain (separate dgit view) may be needed (--quilt=gbp).
> Use of uninitialized value $_ in pattern match (m//) at /usr/bin/dgit
> line 4364.
> ! Push failed, while preparing your push.
> ! You can retry the push, after fixing the problem, if you like.
>
> `debcheckout classic-theme-restorer` will get you what I'm trying to
> push, if that helps, including a pristine-tar branch.
Thanks.
I will look at this later today.
Ian.
Bug#841383: dgit: splitbrain push fails if package was previously pushed without splitbrain
Package: dgit Version: 2.3 Severity: normal classic-theme-restorer is maintained in a team gbp repository. It didn't have any quilt patches before, so I'd made an upload using dgit. I just added a new quilt patch, and now I can't upload with --quilt=gbp. hephaestus ~/src/classic-theme-restorer % dgit --quilt=gbp push canonical suite name for unstable is sid warning: git fetch +refs/tags/archive/debian/*:refs/dgit-fetch/sid/tags/archive/debian/* +refs/tags/debian/*:refs/dgit-fetch/sid/tags/debian/* +refs/dgit/sid:refs/dgit-fetch/sid/dgit/sid created refs/dgit-fetch/sid/heads/master; this is silly, deleting it. downloading http://ftp.debian.org/debian//pool/main/c/classic-theme-restorer/classic-theme-restorer_1.5.7-1.dsc... last upload to archive specified git hash using existing classic-theme-restorer_1.5.7.orig.tar.xz Format `3.0 (quilt)', need to check/update patch stack dgit: split brain (separate dgit view) may be needed (--quilt=gbp). Use of uninitialized value $_ in pattern match (m//) at /usr/bin/dgit line 4364. ! Push failed, while preparing your push. ! You can retry the push, after fixing the problem, if you like. On a second try, I get slightly different output: hephaestus ~/src/classic-theme-restorer % dgit --quilt=gbp push canonical suite name for unstable is sid downloading http://ftp.debian.org/debian//pool/main/c/classic-theme-restorer/classic-theme-restorer_1.5.7-1.dsc... last upload to archive specified git hash using existing classic-theme-restorer_1.5.7.orig.tar.xz Format `3.0 (quilt)', need to check/update patch stack dgit: split brain (separate dgit view) may be needed (--quilt=gbp). Use of uninitialized value $_ in pattern match (m//) at /usr/bin/dgit line 4364. ! Push failed, while preparing your push. ! You can retry the push, after fixing the problem, if you like. `debcheckout classic-theme-restorer` will get you what I'm trying to push, if that helps, including a pristine-tar branch. -- System Information: Debian Release: stretch/sid APT prefers testing APT policy: (900, 'testing') Architecture: i386 (i686) Kernel: Linux 4.5.0-2-686-pae (SMP w/2 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages dgit depends on: ii ca-certificates 20160104 ii coreutils 8.25-2 ii curl 7.50.1-1 ii devscripts2.16.8 ii dpkg-dev 1.18.10 ii dput 0.10.3 ii git [git-core]1:2.9.3-1 ii git-buildpackage 0.8.4 ii libdpkg-perl 1.18.10 ii libjson-perl 2.90-1 ii liblist-moreutils-perl0.416-1+b1 ii libperl5.24 [libdigest-sha-perl] 5.24.1~rc3-3 ii libtext-iconv-perl1.7-5+b4 ii libwww-perl 6.15-1 ii perl 5.24.1~rc3-3 Versions of packages dgit recommends: ii openssh-client [ssh-client] 1:7.3p1-1 Versions of packages dgit suggests: ii sbuild 0.71.0-2 -- no debconf information -- Sean Whitton signature.asc Description: PGP signature
