[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Maintaining two vendor branches of a single program

From: Christian Daudt <csd_ob_at_daudt.org>
Date: 2003-04-07 20:40:04 CEST

As long as you check them in in the proper order (i.e. 2.4.20-ac1 before
2.4.20) you shouldn't need the ac/current part. Just check in everything
sequentially to the same import point (vendor/linux/current) and then take
snapshots/tags from there (e.g. vendor/linux/2.4.20,
vendor/linux/2.4.20-ac1).
 Given that X.Y.Z-acN is always generated from X.Y.Z and that many times
X.Y.(Z+1) will contain a a bunch of the ac mods you should be fine. Of
course, things that are in X.Y.Z-acN and don't make it into X.Y.(Z+1) will
show up as being reversed back if you diff them but that is how it is
supposed to be. Another option is that you hang the AC releases from the
vanilla release that it applies to.
 So method A is:

 <cd to linux-2.4.20>
 svn import to vendor/linux/current
 svn cp vendor/linux/current vendor/linux/vanilla-2.4.20
 <cd to linux-2.4.20-ac1>
 svn import to vendor/linux/current
 svn cp vendor/linux/current vendor/linux/2.4.20-ac1
 [repeat for other 2.4.20-ac]
 <cd to linux-2.4.21>
 svn import to vendor/linux/current
 svn cp vendor/linux/current vendor/linux/vanilla-2.4.21
 [repeat for 2.4.21-ac]

 method B is:

 <cd to linux-2.4.20>
 svn import to vendor/linux/current
 svn cp vendor/linux/current vendor/linux/2.4.20/current
 svn cp vendor/linux/2.4.20/current vendor/linux/2.4.20/vanilla
 <cd to linux-2.4.20-ac1>
 svn import to vendor/linux/2.4.20/current
 svn cp vendor/linux/2.4.20/current vendor/linux/2.4.20/ac1
 [repeat for other 2.4.20-ac]
 <cd to linux-2.4.21>
 svn import to vendor/linux/current
 svn cp vendor/linux/current vendor/linux/2.4.21/current
 svn cp vendor/linux/2.4.20/current vendor/linux/2.4.21/vanilla
 [repeat for 2.4.21-ac]

 I've been using a similar method (only I'm tracking Suse/Redhat branches from
vanilla kernels) and it works fine.

 cheers,
   csd

On Friday 04 April 2003 19:19, John Goerzen wrote:
> Hi,
>
> I've got an interesting case:
>
> I'd like to maintain a development branch of the Linux kernel code for
> my own uses. I have set up a vendor branch for it as described in the
> Subversion Book. However, I'd like to now base my work on the AC
> branch.
>
> For those that don't know, the AC branch is a set of patches on top of
> the regular Linux kernel.
>
> Now, my question is, what is the proper way to do this?
>
> I could obviously do something like a svn cp from vendor/linux/current
> to vendor/ac/current to start with. And when the AC branch revs, I
> can just handle that normally.
>
> But when the Linux branch revs, that's different. The AC patch for a
> new Linux version will often be signifcantly different than for the
> old one, so running a merge on the AC branch doesn't make any sense.
> I thought about just svn rm'ing current on the AC branch and
> recreating it, but I think that will mess up merging on a different
> branch.
>
> The other thing is that with the Linux branch revs, history on the AC
> branch should go back through the Linux branch, so just using a kludge
> like building an AC tree out of Subversion and using svn_load_dirs
> won't quite do it either.
>
> Any thoughts?
>
> -- John
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 7 20:40:42 2003

This is an archived mail posted to the Subversion Dev mailing list.