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

Re: Git, gbp blues

Path	csiph.com!news.dns-netz.com!news.freedyn.net!aioe.org!bofh.it!news.nic.it!robomod
From	Raphael Hertzog <hertzog@debian.org>
Newsgroups	linux.debian.maint.python
Subject	Re: Git, gbp blues
Date	Mon, 26 Aug 2019 11:20:01 +0200
Message-ID	<yzjkl-2rm-13@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> <yz79v-362-1@gated-at.bofh.it>
X-Mailbox-Line	From debian-python-request@lists.debian.org Mon Aug 26 09:19:20 2019
Old-Return-Path	<raphael@ouaza.com>
X-Amavis-Spam-Status	No, score=-11.731 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, HEADER_FROM_DIFFERENT_DOMAINS=0.249, LDO_WHITELIST=-5, MURPHY_DRUGS_REL8=0.02, PGPSIGNATURE=-5] autolearn=ham autolearn_force=no
Mail-Followup-To	Raphael Hertzog <hertzog@debian.org>, Dmitry Shachnev <mitya57@debian.org>, Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com>, debian-python@lists.debian.org
MIME-Version	1.0
Content-Type	multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="SUOF0GtieIMvvwua"
Content-Disposition	inline
User-Agent	Mutt/1.10.1 (2018-07-13)
X-Virus-Status	Clean
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/17186
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/20190826091833.GF991@home.ouaza.com
Approved	robomod@news.nic.it
Lines	45
Organization	linux.* mail to news gateway
Sender	robomod@news.nic.it
X-Original-Cc	Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com>, debian-python@lists.debian.org
X-Original-Date	Mon, 26 Aug 2019 11:18:33 +0200
X-Original-Message-ID	<20190826091833.GF991@home.ouaza.com>
X-Original-References	<CAOTq_2VfyvZ44BpKcG10pVgu6UETGAK8yAG38ojABQOFkjKv0w@mail.gmail.com> <20190825195005.GH1643@belkar.wrar.name> <CAOTq_2XJ4sj3gm7V8nN=Lr=BTNTTcZvAz4q8CQ=ATzRHCzfsRQ@mail.gmail.com> <20190825201938.GA13907@mitya57.me>
Xref	csiph.com linux.debian.maint.python:11673

Show key headers only | View raw

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

On Sun, 25 Aug 2019, Dmitry Shachnev wrote:
> The correct procedure is running “gbp pq import” *before* importing a new
> tarball. Then after importing you do “gbp pq rebase”.
> 
> Sometimes I myself forget to run “gbp pq import”. In this case I do the
> following:

Instead you should use "gbp pq import --time-machine=X" where X is the
number of commits that you accept to go backwards to try to find a point
where the patch series can be applied.

Then you are on your branch, ready for a rebase...

Cheers,
-- 
Raphaël Hertzog ◈ Debian Developer

Support Debian LTS: https://www.freexian.com/services/debian-lts.html
Learn to master Debian: https://debian-handbook.info/get/

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