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

Re: Usage advice - personal branches

From: Quest <quest_at_lysator.liu.se>
Date: 2005-07-09 18:58:12 CEST

On Sat, 9 Jul 2005 15:44:58 +0000 (UTC), John <jsparrow@ecclescollege.ac.uk> writes:

> I've been using SVN for about 12 months now, but I'd like some advice for
> laying out busy, multi user repositories.
>
> We have a policy of committing often (as savepoints, in case of source code
> corruption - we use MS Visual Studio....!). This means that 70% or more of
> revisions don't leave trunk in a 'good' state, and work is only partially
> finished. Obviously this is a pain.
>
> What I'm planning is to have a branch inside each project, for each
> person working on the system. ie:
>
> AmazingProject1
> -trunk
> -branches
> --John
> --Peter
> --Jane
>
> During normal work developers only commit to their branch (hence no problem
> with 'savepoint' commits). When a feature is fully implemented it is merged
> into trunk (and also trunk changes are merged into the personal branch).

This is fine, if you don't care about log history. Every time you
branch a file and then merge it back, any log history on trunk version
of file between branch and merge, will be lost. Thus, there will be
changes made to the file, that won't be documented on the version of
the file that sits at trunk head.

So, if you usually branch to change different parts of the code and
don't make updates on trunk, everything's fine. Or, if you don't care
about logs :).

> Is this the best option? Or should I look at some form of distributed
> version control system? In some ways I'd like my working copy to belong to
> two seperate repo's: a personal, local one for regular savepoints, and a
> central one for sharing.

This sounds more like arch to me.

-- 
Anders "Quest" Qvist
Ye olde jungle proverb:
Even the Phantom must turn on the light to see what's in his goth wardrobe.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 9 19:32:32 2005

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