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

Groups > linux.debian.maint.python > #9586 > unrolled thread

gbp pq conversion

Back to article view | Back to linux.debian.maint.python

Contents

  gbp pq conversion Brian May <brian@linuxpenguins.xyz> - 2017-06-25 10:40 +0200
    Re: gbp pq conversion Brian May <bam@debian.org> - 2017-07-02 13:00 +0200

#9586 — gbp pq conversion

I have a script in git.debian.org that will hopefully help.

I am still testing it on packages, one at a time. I am not yet 100%
confident in its correct operation - although it appeared to work for
Django tables.

/srv/home/users/bam/convert django-tables

I imagine this will need some refinement. In particular, it has some
paranoid checks at the top, which possibly could be relaxed. I overwrite
gbp.conf instead of trying to do something sensible if it exists (hence
the check to ensure it doesn't exist).

I have commented out the code to the the patch queue import and export,
partly because gbp is not installed on git.debian.org, and partly
because this part probably should be done manually in order to check
information is not lost.

Hopefully the permmissions are correct, so that anyone can access the
file.

After the conversion the master branch will be deleted, this needs to be
considered for local checked out copies - making a new clean checkout
might be the easiest solution.
-- 
Brian May <brian@linuxpenguins.xyz>
https://linuxpenguins.xyz/brian/

[toc] | [next] | [standalone]

#9602

The one mistake I seem to often make with gbp pq is import the new
sources and then discover I forgot to one "gbp pq import". The "gbp pq
import" needs to happen first (if not already done), before importing
new sources. Otherwise "gbp pq rebase" and "gbp pq export" can end up
deleting all patches.

The solution I have found is

1. Create a temporary branch at the current commit

    git branch tmp

2. Take the debian/master branch to the previous "good" commit:

   git reset --hard version origin/debian/master

   change the origin/debian/master as appropriate.

3. Import the patch queue (possibly might need to delete any existing
patches branch first):

   gbp pq import

4. Go back to the latest version:

   git reset --hard tmp
   git branch -d tmp

Note that "gbp pq import" must be done in the correct branch, as the
name of the patch branch is based on the current branch.

Also note that the "gbp pq import" must be done on patches unapplied
format, so don't go too far back in the history.
-- 
Brian May <bam@debian.org>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.debian.maint.python

csiph-web