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

Unable to merge

From: Oliver Salzburg <oliversalzburg_at_web.de>
Date: Mon, 04 Feb 2008 14:22:55 +0100

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.

I'm running
"TortoiseSVN 1.4.7, Build 11792 - 64 Bit , 2008/01/05 13:50:18"

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 14:23:31 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.