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

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

Re: Git, gbp blues

Show key headers only | View raw

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

Hi Guðjón!

On Sun, Aug 25, 2019 at 10:01:02PM +0200, Guðjón Guðjónsson wrote:
> 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

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:

- Remember the current commit SHA1;
- git reset --hard origin/debian/master;  # or to previous tag
- gbp pq import;  # this is the needed step
- git checkout debian/master;  # back to debian/master branch
- git merge COMMIT_ID;  # that you remembered before

> 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.

--
Dmitry Shachnev

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