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

Re: vendor branches (was Re: excess diff between branches)

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-07-02 22:49:46 CEST

Ed L Cashin <ecashin@uga.edu> writes:

> * import foo-1.0 as ROOT/tags/foo-1.0
> * copy ROOT/tags/foo-1.0 ROOT/trunk
> * copy ROOT/tags/foo-1.0 ROOT/tags/foo-1.1

OK, so it looks like {/trunk, /tags/foo-1.0, /tags/foo-1.1} all start
out as pointers to the exact same tree.

> * checkout ROOT/tags/foo-1.1, update with vendor changes, and commit

So now /tags/foo-1.1 is a little bit different. It's really a branch
now, not a tag. :-)

> * checkout trunk as foo and cd into foo working copy
> * svn merge ROOT/tags/foo-1.0 ROOT/tags/foo-1.1

That should work just fine, because the foo-1.0 and foo-1.1 trees are
related to each other. They started out as copies of the same tree.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 2 22:51:20 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.