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

[TSVN] Re: Merge only cooperated going the wron way

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2005-01-07 18:31:25 CET

Peter McNab wrote:
> I have a single project containing a trunk and branch.
> I have been working on the branch and now want to merge the changes
> back into the trunk.
> Selecting the Trunk folder, right click Select TortoiseSVN click
> Merge . Brings up the Merge dialog OK
> So. It says Merge changes into current working copy which points to
> the URL: http://192.168.1.20/svn/MyProject/Trunk
> which what is desired.
>
> The "from" URL is then set to
> http://192.168.1.20/svn/MyProject/Branch

So far so good

> The "To" checkbox 'Use "From:" URL is uncheckd.
> Just why I would want to use the From URL as the destination I don't
> quite fathom.

That is where you have gone wrong. Remember that each revision on your
branch is effectively a set of changes to one or more files. Subversion
allows you to merge the changes for a single revision, or for a range of
revisions. The 'To' and 'From' represent the range of revisions that you
want to merge to somewhere else. So you _do_ want the 'Use From: URL'
box checked, and you need to set 'From' to the first change on the
branch, and 'To' to the last change on the branch.

If this still doesn't make sense, read the relevant chapter in the
subversion book which gives a clear explanation of how branching and
merging works.

Simon

-- 
       ___
  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
Received on Fri Jan 7 18:32:35 2005

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