vendor branches (was Re: excess diff between branches)

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

> Ben Collins-Sussman <sussman@collab.net> writes:
...
>> You have two options here:
>>
>> * follow the proper "vendor branching" procedure described in
>> chapter 6 of the book. Use the svn_load_dirs.pl script to help.
>
> I'll re-read it. I'm versioning only a subset of the files in the
> linux kernel, so I get really fast svn performance compared to before,
> but it's easier for me to get confused.

Huh. After re-reading it, I remember that I was doing something
similar to the steps outlined in that chapter. They were not the
same, though. I think that the order of copying may make more of a
difference than I initially thought.

I was doing something like this:

  * 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
  * checkout ROOT/tags/foo-1.1, update with vendor changes, and commit
  * checkout trunk as foo and cd into foo working copy
  * svn merge ROOT/tags/foo-1.0 ROOT/tags/foo-1.1

Should that have worked or is it doomed to failure?

-- 
--Ed L Cashin            |   PGP public key:
  ecashin_at_uga.edu        |   http://noserose.net/e/pgp/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org