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

Re: Bug in tortoiseMerge

From: Anthony Ogier <aogier_at_iorga-group.com>
Date: 2006-10-31 11:14:55 CET

Hi list,

I'm using TSVN 1.4.0 (build 7501) and I still get the same problem.
I'm trying to apply a patch for a maven project, which has a "pom.xml"
file in each subdirectory of the project. In my patch, there is multiple
references to files name "pom.xml", one in each subdirectory.
When applying the patch, I got "The file <subdir path>\pom.xml was found
twice!?! This usually happens if you applied a patchfile to the wrong
folder!"

Does someone know if the bug was *really* corrected ?

Thanks,
    Anthony

From: Tobias Schäfer <tobiasschaefer_at_gmx.de
<mailto:tobiasschaefer_at_gmx.de?Subject=Re:%20Bug%20in%20tortoiseMerge>>
Date: 2006-07-20 09:19:07 CEST

On Tuesday 18 July 2006 18:21, Jon Webster wrote:
/> tortoiseMerge doesn't like applying patches that contain the same file /
/> name more than once. /
/> /
/> That is, it complains if the patch contains /project/dir1/test.sh AND /
/> /project/dir2/test.sh The "file patches" window lists the filename in /
/> red (no mention that they are in separate directories) and raises the /
/> error: /
/> /
/> The file test.sh /
/> was found twice!?! T /
/> his usually happens if you applied a patchfile to the /
/> wrong folder! /

This has been fixed by Stefan in revision 6271 and will be available for
1.4.0.
http://mapcar.org/tsvn-snapshots/latest/changelog.html#r6271

Tobias
Received on Tue Oct 31 11:15:19 2006

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