Hi Jeremy,
On Tue, May 16, 2017 at 07:35:44PM -0400, Jeremy Bicha wrote:
> Package: git-buildpackage
> Version: 0.8.12.2
>
> The Debian GNOME team is discussing their svn-to-git migration.
> There's a concern about how the upstream/ branches will work when we
> temporarily maintain two branches.
Glad to hear you're looking at gbp for that!
>
> For examples, let's say we have debian/unstable and
> debian/experimental where unstable might be 3.22.2 and experimental
> might be 3.23.91 at the time of the divergence. Later there is a
> 3.22.3 and a 3.23.92. Finally, when 3.24.1 is released,
> debian/experimental is merged into debian/unstable and
> debian/experimental is probably deleted.
You likely don't want to delete branches if you want to have a fast
forwarding git history.
>
> What do we do with the upstream branches then?
I'm not following. What would you do with them? Where is the issue at
hand? You don't even need to create separate upstream branchs. Just
pull in the git tags. The manual has various workflows outlined
(e.g. when ustream uses git).
>
> How important is it that upstream imports are tagged? Would it be ok
> to allow import-orig to have a mode where no permanent upstream branch
> is used and no upstream tags are created?
This sounds more like a workflow question. Can we close this and move
over to
http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage
I'm happy to moderate your posts if you dont wanto to subscribe to yet
another list.
Cheers,
-- Guido
