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

Basic merging question..

From: Troy Bull <troy.bull_at_gmail.com>
Date: Wed, 9 Jul 2008 14:25:50 -0500


I have the following situation:


I then make a branch

"my branch"

I commit to my branch every few minutes, basically every change to
anything gets a commit say for example I commit 100 times, now I want
to merge those changes back to Trunk, but I want them all to be
"compressed" and go as 1 change to the trunk. To explain better; if
trunk is at r 10 when I branch, then r11 makes the branch (copy) so
r12 through r111 are changes on my branch, now I want to merge back to
the trunk and the trunk should be at r 112 and that should contain all
the changes I made to the branch from r11 to r 110. Is this how
merging works? or is there some special thing I need to do to get it
to work this way.


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-09 21:26:15 CEST

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.