Re: Making branches and typical patterns

"Russ Freeman" <russ.freeman@ergnosis.com> writes:

> OK, so let me get this straight, you typically have a single working folder
> area. After branching, this working area is pointing to your new branch.
> You then switch *back* some of the local projects to the trunk (or is it the
> other way around?).

The other way around.

For example, when I wrote the autoversioning feature, I began by
copying /trunk to /branches/autoversion.

Then, pretty sure that I'd only be changing files within the
mod_dav_svn subdir, I went back to my working copy of /trunk and
'switched' just my mod_dav_svn subdir to the corresponding directory
in the branch:

 svn switch \
  http://svn.collab.net/repos/svn/branches/autoversion/subversion/mod_dav_svn \
  subversion/mod_dav_svn

Then I was free to make changes in my local mod_dav_svn area, knowing
that my commits there would only go to the branch. At the same time,
it's nice that 'svn up' still receives /trunk changes for every other
part of my working copy. (And the only time I had to worry about
change-porting was the rare situation when somebody actually made a
change to the mod_dav_svn area in /trunk.)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Apr 9 17:06:56 2003