Re: [TSVN] newbie question on merging

Danny Shevitz wrote:

> I have read the manual. Really. For both svn and tsvn. So I apologize
> for not totally understanding this.
>
> Here's the situation.
> 1) I have a trunk, call it rev1
> 2) I create a branch call it rev 2
> 3) I change the trunk and commit, call it rev 3
> 4) I change the branch and commit, call it rev 4
>
> I now want to merge changes. So I

What changes do you want to merge?

> 5) go to the trunk directory and right click to bring up the merge in
> context

So you want to merge the changes you made in the branch back to trunk.

> 6) in the "from" textbox, I set it at branch rev 2 ?????

Yes, that's where you created the branch.

> 7) in the "to" textbox, I set it at branch rev 4 ?????

Yes. That will merge the changes from branch at revision 2 up to branch
at revision 4 back into trunk.

> 8) I do the merge.
>
> Is this correct? I've tried a large number of combinations, and this is
> the one that seems to do what I want.
> I realize I may have conflicts in the files to resolve, and that's OK.
> That's why merging is hard.

That's correct. You did it right ;)

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org