Basic merging question..

[Troy Bull <tr...@gmail.com>]

Greetings

I have the following situation:

"Trunk"

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.

Thanks
troy

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Basic merging question..

[Hari Kodungallur <hk...@gmail.com>]

On Wed, Jul 9, 2008 at 12:25 PM, Troy Bull <tr...@gmail.com> wrote:

> Greetings
>
> I have the following situation:
>
> "Trunk"
>
> 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.
>


This is exactly how merge works. You don't have to do anything special.
You merge everything from 12 through 111 into a local working copy of trunk.
Then commit all merged changes as one version (112, potentially).