Groups > linux.debian.maint.python > #11670

Re: Git, gbp blues

Path	csiph.com!news.dns-netz.com!news.freedyn.net!aioe.org!bofh.it!news.nic.it!robomod
From	Andrey Rahmatullin <wrar@debian.org>
Newsgroups	linux.debian.maint.python
Subject	Re: Git, gbp blues
Date	Sun, 25 Aug 2019 22:20:02 +0200
Message-ID	<yz79w-362-9@gated-at.bofh.it> (permalink)
References	<yz6Gt-2Fh-3@gated-at.bofh.it> <yz6Qa-2IP-15@gated-at.bofh.it> <yz6ZQ-32C-3@gated-at.bofh.it>
X-Original-To	debian-python <debian-python@lists.debian.org>
X-Mailbox-Line	From debian-python-request@lists.debian.org Sun Aug 25 20:10:28 2019
Old-Return-Path	<wrar@debian.org>
X-Amavis-Spam-Status	No, score=-11.98 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DIGITS_LETTERS=1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, LDO_WHITELIST=-5, MD5_SHA1_SUM=-1, MURPHY_DRUGS_REL8=0.02, PGPSIGNATURE=-5, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=ham autolearn_force=no
X-Policyd-Weight	using cached result; rate:hard: -3.5
Dkim-Signature	v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=wrar.name; s=20160710; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID: Subject:To:From:Date:Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=z94qWwq47nGorZCC594rSrYByK9U/+l1cj/UNqY/hQ0=; b=ABpDl2v1cDUjBnLVAdjyY+GH9C R8kFXQxu0xISnVlTw78/JKH8w3RBAuEeZA2xBYCdXh2vf2laLfHbLEASSVpdyChsBqmkm8kCbFmfO ljCAcIXchLtN6KJfDT8XNNHAh7Ts09wLOp/thuS5uWNzAs6/lETGMoTdCMl3/QVyGTZE=;
MIME-Version	1.0
Content-Type	multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="a8sldprk+5E/pDEv"
Content-Disposition	inline
User-Agent	Mutt/1.10.1 (2018-07-13)
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/17182
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/20190825201014.GI1643@belkar.wrar.name
Approved	robomod@news.nic.it
Lines	62
Organization	linux.* mail to news gateway
Sender	robomod@news.nic.it
X-Original-Date	Mon, 26 Aug 2019 01:10:14 +0500
X-Original-Message-ID	<20190825201014.GI1643@belkar.wrar.name>
X-Original-References	<CAOTq_2VfyvZ44BpKcG10pVgu6UETGAK8yAG38ojABQOFkjKv0w@mail.gmail.com> <20190825195005.GH1643@belkar.wrar.name> <CAOTq_2XJ4sj3gm7V8nN=Lr=BTNTTcZvAz4q8CQ=ATzRHCzfsRQ@mail.gmail.com>
Xref	csiph.com linux.debian.maint.python:11670

Show key headers only | View raw

[Multipart message — attachments visible in raw view] - view raw

On Sun, Aug 25, 2019 at 10:01:02PM +0200, Guðjón Guðjónsson wrote:
> > > Isn't this an error. Shouldn't it be git checkout?
> > > $ gbp checkout debian/master
> > Yes.
> You mean it should be git checkout?
Yes.

> > If you ran gbp pq import after importing the new tarball and it didn't say
> > "Patch queue branch 'patch-queue/master'. already exists. Try 'rebase' or
> > 'switch' instead." this means you didn't follow the procedure you copied
> > above, which includes running gbp pq import before gbp import-orig.
> 
> I did follow the procedure but I don't know what to do if a patch
> doesn't apply cleanly.
You seem to be misunderstanding what I wrote.

> I did try
> gbp pq import
> gbp:info: Trying to apply patches at 'c72f39a3a32b5e5c1eb7f9aaf7176e942e85d804'
> gbp:warning: Patch 0004-remove-logo-privacy-issue.diff.patch failed to
> apply, retrying with whitespace fixup
This cannot happen when you run gbp pq import before running gbp
import-orig, as the wiki page tells you to do.
And this cannot happen when you run it after gbp import-orig, if you also
ran it before running gbp import-orig, as the wiki page tells you to do.
So this can only happen if you didn't follow the procedure.

-- 
WBR, wRAR

Back to linux.debian.maint.python | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Git, gbp blues Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com> - 2019-08-25 21:50 +0200
  Re: Git, gbp blues Andrey Rahmatullin <wrar@debian.org> - 2019-08-25 22:00 +0200
    Re: Git, gbp blues Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com> - 2019-08-25 22:10 +0200
      Re: Git, gbp blues Dmitry Shachnev <mitya57@debian.org> - 2019-08-25 22:20 +0200
        Re: Git, gbp blues Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com> - 2019-08-26 08:30 +0200
          Re: Git, gbp blues Andrey Rahmatullin <wrar@debian.org> - 2019-08-26 08:40 +0200
        Re: Git, gbp blues Raphael Hertzog <hertzog@debian.org> - 2019-08-26 11:20 +0200
          Re: Git, gbp blues Dmitry Shachnev <mitya57@debian.org> - 2019-08-26 13:10 +0200
            Re: Git, gbp blues Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com> - 2019-09-07 08:50 +0200
              Re: Git, gbp blues Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com> - 2019-09-08 00:00 +0200
                Re: Git, gbp blues Dmitry Shachnev <mitya57@debian.org> - 2019-09-08 16:20 +0200
              Re: Git, gbp blues Dmitry Shachnev <mitya57@debian.org> - 2019-09-08 16:20 +0200
      Re: Git, gbp blues Andrey Rahmatullin <wrar@debian.org> - 2019-08-25 22:20 +0200

csiph-web