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

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

Re: Git, gbp blues

Show all headers | View raw

Hi Dmitry and Anrdrey

On Sun, Aug 25, 2019 at 10:19 PM Dmitry Shachnev <mitya57@debian.org> 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.
>
> 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
Thanks, this is useful for me.
>
> > 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?
The patch queue must apply cleanly in gbp pq import and
in general you can assume it doesn't with new upstream and
old patch queue.
I still don't understand how to edit the patches the correct way
after a new upstream release.

Regards
Gudjon

Ps. The package qscintilla2 is pushed, still a few lintian warnings to fix.

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