[git-buildpackage] Upgrade a package to the same version in two branches

[Guido Günther]

Hi,
On Thu, Jul 05, 2018 at 12:06:38AM +0200, Sebastian Andrzej Siewior wrote:
> Hi,
> 
> going from one upstream version to another I do
> 	gbp import-orig $orig_file
> followed by a rebase. This works file for the `unstable' branch. Now if

In gbp we don't rebase but "merge" (either literally or by replacing the
debian dir on the branch)

> I want to do the same `stable' branch (forward upstream package version
> instead of adding patches on top of it) then gbp complains about
> existing tags which were created as part of the import for unstable.

You can just merge in the upstream version (or merge in the debian
version (as we e.g. do for thunderbird to do the stable backports).

> For git-dpm I had a workflow where I skipped the orig import for stable
> and just forwarded the upstream branch manually and continued with
> rebase and everything worked out.
> What would be the proper way for gbp here (or does this sound like I do
> something wrong)?

I'm not entirely sure what you want to do. Here's what I do when
e.g. backporting libvirt:

git co debian/sid
gbp import-orig --uscan
<mangle stuff, rebase patches usig pq, whatver>
<build and tag a relase, say 3.0.01>

# for the stable backport

git merge debian/3.0.0-1
<do the necessary changes for the backport (once)>
# and for newer versions just repeat:
git merge debian/3.0.0-2
<mangle stuff iff needed, use pq to update/add patches, ...>

Is it that what you're after or s.th. else?
Cheers,
 -- Guido