[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: Jonathan Ashley <jonathan.ashley_at_praxis-his.com>
Date: Mon, 4 Feb 2008 15:23:09 +0000

> 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.


Jon Ashley
This email is confidential and intended solely for the use of the individual to whom it is addressed. If you are not the intended recipient, be advised that you have received this email in error and that any use, disclosure, copying or distribution or any action taken or omitted to be taken in reliance on it is strictly prohibited. If you have received this email in error please contact the sender. Any views or opinions presented in this email are solely those of the author and do not necessarily represent those of Praxis. 
Although this email and any attachments are believed to be free of any virus or other defect, no responsibility is accepted by Praxis or any of its associated companies for any loss or damage arising in any way from the receipt or use thereof. The IT Department at Praxis can be contacted at it.support_at_praxis-his.com.
Praxis High Integrity Systems Ltd:
Company Number: 3302507, registered in England and Wales
Registered Address: 20 Manvers Street, Bath. BA1 1PX
VAT Registered in Great Britain: 682635707
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 16:23:20 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.