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

[TSVN] newbie question on merging

From: Danny Shevitz <shevitz_at_lanl.gov>
Date: 2004-09-18 00:25:09 CEST

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
5) go to the trunk directory and right click to bring up the merge in context
6) in the "from" textbox, I set it at branch rev 2 ?????
7) in the "to" textbox, I set it at branch rev 4 ?????
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.

thanks,
Danny

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Sep 18 13:04:28 2004

This is an archived mail posted to the TortoiseSVN Dev mailing list.