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

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

Re: Git, gbp blues

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