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

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

Re: Git, gbp blues

Show all headers | View raw

Hi Andrey

Thanks for the answer.
On Sun, Aug 25, 2019 at 9:50 PM Andrey Rahmatullin <wrar@debian.org> wrote:
> > Isn't this an error. Shouldn't it be git checkout?
> > $ gbp checkout debian/master
> Yes.
You mean it should be git checkout?
>
> 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.
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
gbp:error: Failed to apply
'/home/gudjon/debian/python-modules/qscintilla2/debian/patches/0004-remove-logo-privacy-issue.diff.patch':
Error running git apply: error: patch failed:
doc/Scintilla/index.html:64
error: doc/Scintilla/index.html: patch does not apply
gbp:error: Couldn't apply patches

But fixing the patches with quilt before importing them the second
time seems to fix all my problems.

I can push my changes if you want to take a look?

Regards
Gudjon

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