#1043142 git-buildpackage: import-dscs importing upstream branches out-of-order

#1043142#5
Date:
2023-08-06 16:18:43 UTC
From:
To:
Dear Maintainer,

When using:

    gbp import-dscs --debsnap acr

or

    debsnap acr; gbp import-dscs source-acr/*.dsc

the result is the upstream branches out-of-order. See the following command
after an import (important lines only):

$ git log
commit 17d263cee50d3f4b8ba881ca7216194672e7fdfb (HEAD -> debian/master, tag: debian/1.9.4-2)
Author: Thiago Marques Siqueira <thiagoms.15@gmail.com>
Date:   Sun Jul 9 17:11:06 2023 +0100
[...]
commit 8b622b80fb70e9cbdbd071f1d7f714f3f9629e57 (tag: debian/1.9.4-1)
Merge: 4adf342 ce6c977
Author: Ruben Pollan <meskio@sindominio.net>
Date:   Wed Nov 11 13:04:48 2020 +0100
[...]
commit 4adf342f0ecaf0853e88882a67ce4ecd3e1acc4b (tag: debian/1.9.2-1)
Merge: 5c67e33 e093e17
Author: Ruben Pollan <meskio@sindominio.net>
Date:   Mon May 11 17:50:30 2020 +0200
[...]
commit ce6c977714bed2df56c2b5196c63be93163b9c76 (tag: upstream/1.9.4, upstream)
Author: Joao Eriberto Mota Filho <eriberto@debian.org>
Date:   Sun Aug 6 12:49:57 2023 -0300
[...]
commit 5c67e33227e93c952beb794f187f0ea939bf6da3 (tag: debian/1.7.2-1)
Merge: bf4799a 8fb8e10
Author: Ruben Pollan <meskio@sindominio.net>
Date:   Thu Feb 21 13:36:37 2019 +0100
[...]
commit e093e17ad41e54455a91294fe7f91ea02a9d3b32 (tag: upstream/1.9.2)
Author: Joao Eriberto Mota Filho <eriberto@debian.org>
Date:   Sun Aug 6 12:49:57 2023 -0300
[...]
commit bf4799a838a39ebfc55ab0a5927d8199918ed5ee (tag: debian/1.7.0-1)
Merge: f75f0d0 4ed59ec
Author: Ruben Pollan <meskio@sindominio.net>
Date:   Tue Oct 2 12:40:27 2018 -0500
[...]
commit 8fb8e104db07fac42c81a796c50cf47febdb130b (tag: upstream/1.7.2)
Author: Joao Eriberto Mota Filho <eriberto@debian.org>
Date:   Sun Aug 6 12:49:56 2023 -0300
[...]
commit f75f0d08a3b8e81914fbe69450e1215be93231e1 (tag: debian/1.6.2-1)
Merge: 8765fb7 b83b9fb
Author: Ruben Pollan <meskio@sindominio.net>
Date:   Fri May 18 20:20:29 2018 +0200
[...]
commit 4ed59ece03f46f22e525615aa3283ce8e4344043 (tag: upstream/1.7.0)
Author: Joao Eriberto Mota Filho <eriberto@debian.org>
Date:   Sun Aug 6 12:49:56 2023 -0300
[...]
commit 8765fb751b746fb7e2aa320821972735869ca8d7 (tag: debian/1.6.1-1)
Merge: 281c76f 3916c6a
Author: Ruben Pollan <meskio@sindominio.net>
Date:   Mon Apr 16 09:54:12 2018 +0200
[...]


I consider this issue 'important' because several people use gbp import-dscs to
create a repository for a package, keeping all previous history. Importing each
package by hand using import-dsc (not dscs) will work fine.

Regards,

Eriberto

#1043142#10
Date:
2025-04-09 20:31:58 UTC
From:
To:
Hi again Guido,

Today I created a loop 'for' to import several 'dsc' downloaded via debsnap
command. This loop was using the 'gbp import-dsc' command. For my surprise,
the order of upstream branches was truncated. So I added a 'sleep' command
after 'gbp import-dsc' and the result was fixed. The conclusion is some
imports are occurring before the last import ends.

Could you add an option to provide a pause between each import? Something
like this:

   gbp import-dscs -p 30 source/*.dsc

Where 30 is the time in seconds.

Another solution is to make the command 'gbp import-dscs' to verify if the
tags upstream/<version> and debian/<revision> were created before start to
import the next 'dsc'.

Cheers,

Eriberto