Re: Bug in tortoiseMerge

Anthony Ogier wrote:
> Now, I have TortoiseSVN 1.4.3, Build 8645 (latest), and I still have the
> problem. And it is *not* due to manual editing of patchfile !
> Here is another procedure :
>
> * From my local SVN, I modify the files :
> o project/pom.xml
> o project/module_1/pom.xml
> o project/module_2/pom.xml
> * Then, I right-click on project > TortoiseSVN > Create patch...
> * After creating the patch (with default parameters), I do a
> right-click on project > TortoiseSVN > Revert, and I revert all my
> changes
> * Now, I right-click on project > TortoiseSVN > Apply patch..., I
> select my patch file, and then, I have a list of "File patches" in
> the GUI containing only "pom.xml" files (that's good), but 2 of
> them are red ! (that's bad...)
> * When clicking on a red "pom.xml", I've got that message :
>
> The file pom.xml
> was found twice!?!
> This usually happens if you applied a patchfile to the
> wrong folder!
>
> ... I think it's definitively a bug in Tortoise isn't it ?

Fixed in revision 8967.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org