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

Re: Problem merging files with same filename in different directories

From: Stefan KŁng <tortoisesvn_at_gmail.com>
Date: 2005-10-24 19:51:14 CEST

Christian Ehrlicher wrote:

> Merging doesn't work when there are two files with the same filename in
> different directories. It just tell me that I'm maybe in a wrong
> directory ('The file Sconscript was found twice!?! This usally happens
> if you applied the patchfile to a wrong folder!'). But this isn't true
> because I've two files 'Sconscript' - one of them is in a subdir.

Make sure you don't have another file with the same name in the original
directory. Even if the file differs in case (e.g. file vs. File) - on
Windows that's the same file.

You should also try the Subversion command line client (the official
binary of Subversion) to do your merge. If that one complains too, then
you have to report this on their mailing list.
The reason for this is that TSVN uses the Subversion library for such
commands - TSVN itself doesn't do the merge. So if the merge fails, then
it's most likely a bug in the Subversion library, not TSVN.

Stefan

-- 
        ___
   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 Mon Oct 24 19:51:59 2005

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

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