Hi Iain,
(it seems this never ended up in my inbox, so sorry for the late reply):
On Mon, May 14, 2018 at 11:11:33AM +0100, Iain Lane wrote:
> [ dropped d-x ]
>
> Hey all,
>
> Thanks for this bug and the work so far. I just wanted to give a couple
> of thoughts, and maybe later on help with the patch if that's useful.
>
> > We can likely do with a single control file entry like:
> >
> > X-Vcs-Upstream-Git: <url> -b <branch>
> >
> > which would match the existing Vcs-* syntax.
>
> What do you imagine the `-b' switch doing? For me I am mainly interested
> in upstream's commits to use with `--upstream-vcs-tag'. Maybe it creates
> a tracking branch 'upstream/<branchname>'?
-b would set up the a tracking branch. If we default to naming the
remote "upstream" it would be equivalent to
git branch -u upstream/<branchname> <branchname>
> My real main question, though, is about derivatives. I mainly work on
> Ubuntu, and for GNOME stuff we're starting the process of converting off
> our bzr branches to base on top of Debian's gbp repositories. In order
> to pull new commits/uploads, we need to have Debian's commits available
> to `git merge' with. There's a not-consistently-followed-but-could-be
> convention of using
>
> XS-Debian-Vcs-$VCS: $foo
I think this makes sense in general since it will allow us to track
"real" upstream (i.e. GNOME) and the upstream distro (i.e. Debian from
Ubuntu's POV). We should turn it around though to match the above
X-Vcs-Upstream-Git:
X-Vcs-Debian-Git: <url> [-b <branch>]
(I don't remember what's the difference beween XS- and X- though).
> in d/control when updating Vcs-Git to represent the (distro) upstream's
> VCS. It'd be good to use this, or some other metadata, to set up a
> `debian' remote too. Questions:
>
> - Would this be acceptable?
> - How do we know what to put in the middle of the field there? One
> answer is the 'Parent' distribution:
> laney@nightingale> dpkg-vendor --query Parent # running on Ubuntu
> Debian
I think that's fine for the time being. In case dpkg-vendor is not sane
we can make it overridable via gbp.conf.
> ? Or we could just directly specify this in gbp.conf when forking a
> repsitory from Debian:
> [ clone ]
> extra-remotes = debian,someurl xxx,yyy ...
I'd rather have as much of this in d/control as possible since it's not
only gbp that benefits from it.
Cheers,
-- Guido
>
> Cheers,
>
> --
> Iain Lane [ i...@orangesquash.org.uk ]
> Debian Developer [ la...@debian.org ]
> Ubuntu Developer [ la...@ubuntu.com ]
