[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: More git policy: xsfbs and bundled apps packages

On Wed, 2007-01-10 at 20:18 -0500, David Nusinow wrote:
> On Wed, Jan 10, 2007 at 04:31:07PM +1100, Drew Parsons wrote:
> > 
> > >  The apps are fairly easy. We use the upstream* branches and just extend
> > > it so we have individual upstream* branches for each upstream app repo.
> > > These all get merged in to debian as the need arises.
> > 
> > Is it as simple as that?  The upstream apps are all separate repos, but
> > for our convenience we've collected them into single packages, for
> > instance xbase-clients (also xprint-utils and xutils).  So we'd want
> > xbase-clients managed as only one repo, at least as far as the debian*
> > branches go, which conflicts with all the individual upstream* branches
> > for each app contained in xbase-clients. We wouldn't be able to use
> > git-pull in the usual way (unless git is more flexible than I realise.
> We should be able to. You can test it yourself. Make a temporary repo with
> a file "a" in it. Once this is checked in, make a second branch with a file
> "b". Then go back to the master branch and make a third branch with a file
> "c". Your layout will be like this then:
>   branch    files
>   -----     -----
>   master    a
>   second    a b
>   third     a c
> Then you can go back to master and pull second and third in independantly.
> You'll end up with master having files a, b, and c. This is pretty much the
> model for these packages. Since the second and third branches are unaware
> of each others individual files, they don't get deleted when their changes
> are pulled in to the master branch.

Does this also work when different branches have the same files in
different paths? (I assume the contents of each upstream repo will be in
a subdirectory on the combined branch(es))

Earthling Michel Dänzer           |          http://tungstengraphics.com
Libre software enthusiast         |          Debian, X and DRI developer

Reply to: