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

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:00:02 +0200
Message-ID	<yz6Qa-2IP-15@gated-at.bofh.it> (permalink)
References	<yz6Gt-2Fh-3@gated-at.bofh.it>
X-Mailbox-Line	From debian-python-request@lists.debian.org Sun Aug 25 19:50:18 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, LDO_WHITELIST=-5, 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: -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=JBKZ0kh4UYJ7Dqz47M/7DAINqxRb0rrxYoFSxc/OOQs=; b=mlBukvDb7nz/JUzozojem5rbnx Le4KrCfY20rQzW5EW/JKtVFSICrCOdXvZMpkq/vVab1qxmK1GUaEHaac+sgaXnrGyGn1v71EHY7wg jzRmlHOiWQAovZffwL1PgG9dVjG2mVzm5mulFSgn5HoAjoaOk246xrMPGO24kvtsMQns=;
MIME-Version	1.0
Content-Type	multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Y+xroYBkGM9OatJL"
Content-Disposition	inline
User-Agent	Mutt/1.10.1 (2018-07-13)
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/17180
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/20190825195005.GH1643@belkar.wrar.name
Approved	robomod@news.nic.it
Lines	66
Organization	linux.* mail to news gateway
Sender	robomod@news.nic.it
X-Original-Date	Mon, 26 Aug 2019 00:50:05 +0500
X-Original-Message-ID	<20190825195005.GH1643@belkar.wrar.name>
X-Original-References	<CAOTq_2VfyvZ44BpKcG10pVgu6UETGAK8yAG38ojABQOFkjKv0w@mail.gmail.com>
Xref	csiph.com linux.debian.maint.python:11667

Show key headers only | View raw

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

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

> But I still find working with patch queues difficult especially with
> new upstream where the old patches don't apply correctly.
> I tried to do
> $ gbp pq import
> but it fails because one of the patches doesn't apply.
> So I fixed the patches in the old way using
> quilt push -f
> quilt edit
> quilt refresh
> And after having fixed all the patches I could do
> $gbp pq import
> $gbp pq export
> and the diff seems ok.
> Is this the correct procedure?
The correct procedure is documented on that page.

"""
Rebase the patches:

$ gbp pq rebase
$ gbp pq export
"""

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.


-- 
WBR, wRAR

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