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

Maintaining two vendor branches of a single program

From: John Goerzen <jgoerzen_at_complete.org>
Date: 2003-04-05 05:19:49 CEST


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

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

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
Received on Sat Apr 5 05:20:54 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.