On Mar 13, 2006, at 2:33 AM, Ryan Schmidt wrote:
> For our web sites, we do it differently: we currently follow the
> book's release branch recommendations, where we have, say, a
> version 1.1 of the web site as a branch, while work continues on
> trunk on what will eventually become version 1.2. The most critical
> changes can get merged from trunk to the 1.1 branch right away, and
> a new release of 1.1 is tagged and moved to the production web
> server (via essentially an svn switch of its working copy).
Ryan, how do you merge only the most critical changes without getting
the rest of the work that's going on? From what I can see, svn merge
only works with revision numbers, not files, so if you like to commit
your work periodically while it's in process, like I do, I don't see
how you can merge only the changes you want.
This seems like it would work, but there's a lot of overhead there:
- set up main codebase in /trunk
- create three branches: release, work, tweaks
- set up live site from release branch
- do longer term work in work branch, committing as desired
- do changes that need to go out right away to tweaks branch. Merge
these into the trunk and then into the work and release branches,
update live site
- when longer term project is ready to go, merge it from work branch
into trunk and tweaks and release branches, update live site
This seems to be the only way to have a revision to merge that
contains only the change to be made live and nothing else. And it
gets worse if you work on multiple long-term projects or multiple
tweaks at once - how many branches can one brain keep straight? :)
I realize that adopting a new tool often requires changes to the way
one does things, but this is particularly awkward. I am going to
have to either stop committing any work until it's ready to be
released, or manage an interstate highway system of branches.
Neither seems ideal to me. Am I misunderstanding how Subversion works?
thanks,
janine
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Mar 14 22:28:31 2006