[haiku-development] Re: Vendor branches (was: VOTE: Git or Mercurial (hg) as Haiku's new source control tool)

  • From: "Niels Sascha Reedijk" <niels.reedijk@xxxxxxxxx>
  • To: haiku-development@xxxxxxxxxxxxx
  • Date: Tue, 17 May 2011 09:20:02 +0000

Hi,

Andreas Färber <andreas.faerber@xxxxxx> wrote:
> Am 14.05.2011 um 15:22 schrieb Ingo Weinhold:
>
> > Something unrelated: What are we going to do with vendor branches?
>
> We should get rid of them. :)
>
> My number one candidates are binutils and gcc. binutils was still
> versioned with CVS last time I checked, and GCC is in SVN. In a git
> world, we would fork some git mirror, apply our changes on top, pull
> +merge as necessary and could embed that independent repo as a git-
> submodule into the haiku tree. That's similar to SVN externals.

Similar for the hg case. We would just clone (or clone+convert) the
original repositories, then add our changes in a parallel branch, and
embed those as a nested repository.

> git-submodules could also be used for libraries / tools where we just
> added a Jamfile or did minor changes.

Like nested hg repositories.

> However drivers based off, e.g., FreeBSD where we just want selected
> files would seem a little more complicated.

> If we decide for git but some project we reuse uses hg (or vice versa,
> i.e. cross-DVCS), that makes things more difficult, too.

Doesn't have to be that much of a problem. Tools exist to convert from
git to hg and vice versa. So it would be like incorporating svn or cvs.

Regards,

N>

Other related posts: