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

Re: move branch->trunk or merge?

From: Paul Koning <pkoning_at_equallogic.com>
Date: 2005-09-20 15:55:07 CEST

>>>>> "Oliver" == Oliver Betz <list_ob@gmx.net> writes:

 Oliver> Hi all, what is the appropriate method if there were only
 Oliver> minor changes in the trunk, but many changes in a branch all
 Oliver> to be merged to the trunk:

 Oliver> I could merge the few trunk changes to the branch and move
 Oliver> (rename) the branch to the trunk, resulting in much less
 Oliver> (duplicate) merging,

 Oliver> or make a big merge branch -> trunk. In this case I wonder
 Oliver> whether I should repeat all commit comments or only say
 Oliver> "merged all changes of branch foo".

 Oliver> As a SVN newbie I can't see what's better (safe, clear,
 Oliver> efficient).

I'm an SVN newbie too. But anyway...

If one side has few changes, then a merge should be easy. It
shouldn't matter whether you merge branch to trunk or trunk to
branch.

So I would get myself a clean working directory of the trunk, merge
the branch to it, and do one commit.

Moving a branch to trunk seems like a bad idea, that confuses the
picture quite badly. I like my revision trees to be trees, not
graphs... :-)

          paul

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 20 15:59:57 2005

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