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

Re: Using separate branches for each developer - How to continue after merge?

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-03-15 03:41:19 CET

On 3/14/07, Neil Aggarwal <neil@jammconsulting.com> wrote:
> Hello:
> We have a project where we are going to use subversion.
> Each developer will have their own branch to make changes
> and only the project manager can merge their changes into
> the trunk.
> Once the manager merges the changes from a developer
> branch to the trunk, is it better to delete the developer
> branch and create a new one or merge the trunk into
> the developer branch?

If you delete, you'll break the history of the developer's work in a
way. What if, in the future, you want to get a log of that one
developer's full work history? You'll have to do a lot of monkeying
with revisions in svn log to pull it all. If you merge trunk back into
the developer branch (which your developers will have to do anyway, as
they're going to want to keep up with work done by other developers as
it's merged into trunk), you can get the history with one svn log.

> If we delete the developer branch, I assume we cannot create
> a new branch with the same name so we will have to create
> new branches each time we do a merge. Is that correct?

No, you can delete a file or directory then create/add one with the
same name. They will not, however, share history (see above); they're
two separate and distinct entities in the repository.

> We can create a simple branch naming convention like:
> Neil_r38 to show the branch started from revision 38
> of the trunk.

But svn log will tell you where you copied the branch from, and at
what revision.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 15 03:41:46 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.