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

Problem merging files with same filename in different directories

From: Christian Ehrlicher <Ch.Ehrlicher_at_gmx.de>
Date: 2005-10-23 19:55:40 CEST

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello,

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.

Christian

btw: Please CC me as I'm not on the list.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFDW86cnNKwkgf+zVMRAndOAJ4kji0v91pR87M2/WEOuwtW8oXdngCfQ//H
IdX35ts7UKo83MfNI5M2FVg=
=T7A5
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Oct 23 20:12:29 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.