Hmm, I think I see a couple of problems here, and I think it's my fault for
not explaining in more depth:
On Mon, Apr 07, 2003 at 11:40:04AM -0700, Christian Daudt wrote:
> So method A is:
>
> <cd to linux-2.4.20>
> svn import to vendor/linux/current
By svn import here and below, I take it you mean something like
svn_load_dirs that can handle diffs, added/removed files, etc?
> 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]
The problem with this is that it can't handle more than one tree. For
instance, I may want to have 2.4.20-ac1, as well as the davem series, the
benh series, and the aa series in my Subversion repository. With this
method, I don't think I can do that.
> <cd to linux-2.4.21>
> svn import to vendor/linux/current
This is the place where I take it you'd see the reverse patches, right?
On the one hand, you're correct that that could technically be considered
correct, but on the other hand, if the patches are coming back in with ac1,
wouldn't that make merging with svn merge difficult?
> 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.
I think this one could work well for me with a slight mod. Instead of doing
a cp from vendor/linux/current to vendor/linux/2.4.21/current, I could cp it
to vendor/linux/2.4.21/ac, vendor/linux/2.4.21/davem, etc. Then track those
branches. Does that make sense?
Now, here's the question: how well will this work with svn merge from say,
2.4.19ac3 to 2.4.20ac5?
-- John
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 7 21:07:04 2003