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

Re: Unable to merge

From: Oliver Salzburg <oliversalzburg_at_web.de>
Date: Mon, 04 Feb 2008 17:58:52 +0100

Jonathan Ashley wrote:
>> Subject: Unable to merge
>> Hi,
>> i am trying to merge changes from the trunk into my branch.
>> So, in the the dialog, i select the trunk directory in the
>> From field and select HEAD revision.
>> In the To field i select my branch and also the HEAD revision.
>> Now, when i click Diff, i see exactly what i expected. It
>> lists 4 files that are different.
>> But neither Merge nor Dry run do anything.
>> No files are changed, but the dialog title says it's finished.
> That's exactly what you'd usually expect.
> The merge command is badly named - it should have been called
> 'diff-and-apply'. It takes the set of changes needed to turn
> the FROM into the TO, and applies that set of changes to the
> target working copy.
> For your use case, you probably want FROM to be the trunk at
> the revision that you split the branch off at, and TO to be the
> trunk at revision HEAD. Apply it to a working copy of the
> branch. Then, you are applying the changes that have been made
> on the trunk since the branch was taken to the branch itself.
> If you want to subsequently merge the branch back to the trunk,
> you'll need FROM to be the trunk at revision HEAD, TO to be the
> branch at revision HEAD, applying to a working copy of the trunk.
> It takes a bit of getting used to admittedly, but once it clicks,
> it's quite intuitive.
> regards,
> --
> Jon Ashley
Ah, i totally got the wrong idea about how to use that feature.
Thank you (and Kurt) for clearing that up for me :)

To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-02-04 17:59:06 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.