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

Re: Confused about merging

From: Bob Proulx <bob_at_proulx.com>
Date: 2006-12-01 07:41:14 CET

Tremal Naik wrote:
> 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

I am not a TortiseSVN user. You may want to read through the online
book and see if it gets the concepts across and then you can apply it
to the TortiseSVN GUI.

  http://svnbook.red-bean.com/nightly/en/svn.branchmerge.copychanges.html

> 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

Between 40 and 41 is one change on the main trunk. With the command
line client I would do the following.

  svn diff -r40:41 $URL/trunk | less

Verify that is what I want and then merge it in.

  svn merge -r40:41 $URL/trunk .

Then verify that it created the differences that I wanted.

  svn diff | less

Bob

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Dec 1 07:40:55 2006

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