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

Re: Mixed up Panels in Merge Dialog (of Branches)

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-08-14 14:31:33 CEST

On 8/14/07, Huber Philipp (Helbling Technik) <philipp.huber@helbling.ch> wrote:
>
>
>
> Hi
> I just tried and experimented with the Merge Dialog to merge Branches.
>
> It might be, that I haven't fully got the clue, but I think, the 'From' and
> 'To' pannels are mixed up.
>
> E.g. To get my changes made in branchA to trunk I need to choose 'Merge...'
> in the Windows Explorer Context Menu on the trunk directory. However in the
> poping up Merge Dialog I need to set the 'From' URL to trunkt and the 'To'
> URL to branchA.
>
> I expected it to work the other way round ('From' URL should point to the
> origin and 'To' URL to the brunch where you expect the changes to be done)

Both your "expected" usage and actual usage are wrong, most likely.

In most cases, your From and To URLs will be identical. A merge is
"calculate the difference between these 2 points and apply the
difference to this working copy." So you should have a WC of your
trunk, right-click on that, and merge "from" the revision in the
branch where you want to start making the diff, and "to" the last
revision in the branch where you want to stop diffing.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Aug 14 14:29:21 2007

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