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

Re: Branching models

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2004-03-05 20:29:59 CET

Chris Wein <cwein@mobilygen.com> writes:

> The answer to this is svn switch where you switch only the subset of
> files you are working. An svn update should update all non-switched
> files to the latest trunk revision without merging, with the
> developer then having to merge the trunk into the branch to resolve
> files changed both on the developer branch and between revs 100 and
> 110. Does this seem right so far?

Yes, although you may want to merge just the switched files.

> One concern I have is that the it is easy to forget to svn switch a file
> before editing it so that you inadvertently edit a trunk file instead of
> branching first. ClearCase handles this by forcing a switch before the
> file can be edited (hard to explain if you dont know clearcase). I am
> sure I can write a script to make it easier but I am not sure how I can
> remove the risk of inadvertent trunk editing.

It is possible to switch at any stage including after editing, so
don't bother trying to enforce the switch before editing. Concentrate
on making sure that the modified files are switched before commit (svn
status will indicate which files are modified and which files are
switched). If you can define some criteria to determine when a trunk
commit should be allowed then it may be possible to use a pre-commit
hook to reject commits that are not switched.

Philip Martin
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 5 20:30:26 2004

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