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

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

Re: Git, gbp blues

Show all headers | 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

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