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

Confused about merging

From: Tremal Naik <tremalnaik_at_gmail.com>
Date: 2006-11-30 18:49:42 CET

Hi folks,
referring to the TortoiseSVN Documentation:

"5.17.1. Merging a Range of Revisions
To merge revisions you need to go to a working copy of the branch in
which you want to receive the changes
1 - In the From: field enter the full folder url of the branch or tag
containing the changes you want to port into your working copy.
2 -Because you are porting a range of revisions from the same branch
into your working copy, make sure the Use "From:" URL checkbox is
checked"

Ok, I need to port some changes from the trunk to a branch (say,
foobranch), so according to what I read above I switched to the branch
foobranch (I checked that I really had the foobranch source on my
local drive), then

1- I selected the trunk as From:
2- I checked the "Use from" checkbox
3- I selected revision 40 and 41 as source and destination respectively

But the merge didn't work, i mean that when I performed a diff, the
differences shown where those between revs 40 and 41 of the trunk, not
between the 40 of the trunk and the 41 of the foobranch. That led to a
conflict on some files

To make it work I had to

1- select the trunk as From: with rev 40
2- select the foobranch as To: with rev 41

The things worked but not so well (a couple of files where deleted and
added again with identical copies)

so, I would like to kbow where I'm doing wrong?

Thanks for your help

-- 
TREMALNAIK
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 30 18:50:48 2006

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