Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

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

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 Mon, 26 Aug 2019 08:40:01 +0200
Message-ID <yzgPv-MJ-7@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> <yzgFP-Jr-7@gated-at.bofh.it>
X-Mailbox-Line From debian-python-request@lists.debian.org Mon Aug 26 06:31:38 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=ejGqZiJFwXkYjKbKRBORMJcUqB/1mlC7lO3f/3MpS2E=; b=m/++Ipe2Kr3FgWzCgBdgiHHu8d WjRk67cvXvOMdOF7T58PXWTa6jeygho5w13tlBMG/HfjjvTeI1KQSasgFBw3QLB2ku40FSFkj53ur aF/q7FzX/wVKSR79PGhYi0RCXtGyh4AfflyQtdnQcxJRLl6V4ZWdK+bjvJ54TpqhqlmE=;
MIME-Version 1.0
Content-Type multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="FUFe+yI/t+r3nyH4"
Content-Disposition inline
User-Agent Mutt/1.10.1 (2018-07-13)
X-Mailing-List <debian-python@lists.debian.org> archive/latest/17185
List-ID <debian-python.lists.debian.org>
List-URL <https://lists.debian.org/debian-python/>
List-Archive https://lists.debian.org/msgid-search/20190826063124.GJ1643@belkar.wrar.name
Approved robomod@news.nic.it
Lines 57
Organization linux.* mail to news gateway
Sender robomod@news.nic.it
X-Original-Date Mon, 26 Aug 2019 11:31:24 +0500
X-Original-Message-ID <20190826063124.GJ1643@belkar.wrar.name>
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> <CAOTq_2UizZU+qv02gLKg=t5szf20aTCTh_PKgx-6vaiNE-0rCg@mail.gmail.com>
Xref csiph.com linux.debian.maint.python:11672

Show key headers only | View raw

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

On Mon, Aug 26, 2019 at 08:20:13AM +0200, Guðjón Guðjónsson wrote:
> > The correct procedure is running “gbp pq import” *before* importing a new
> > tarball. Then after importing you do “gbp pq rebase”.
> In fact I did do that.
Then you would get an error message when trying to do that second time.

> > > But fixing the patches with quilt before importing them the second
> > > time seems to fix all my problems.
> > If it does not break the patches metadata then it also works.
> But what other way is possible?
gbp pq rebase.
Seriously.

> The patch queue must apply cleanly in gbp pq import 
And it will, of course.

> in general you can assume it doesn't with new upstream and
> old patch queue.
This is not something you can or should do.

> I still don't understand how to edit the patches the correct way
> after a new upstream release.
gbp pq rebase, as the wiki page tells you.

-- 
WBR, wRAR

Back to linux.debian.maint.python | Previous | Next — Previous in thread | Next 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