[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: Tobias Schäfer <tobiasschaefer_at_gmx.de>
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

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Jul 20 09:19:55 2006

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