Re: Problems with TortoiseMerge

Johann Reyes wrote:

> I’m having a really weird problem with the latest release version of
> tortoisesvn when I try to apply a patch to a directory I get an error
> like this:
>
> --------------
> The patch seems outdated! The file line
>
> and the patch line
> }
> do not match!
> --------------
>
> And the weird part is that with version 1.3.1 or using a patch command
> it just works fine. Can someone give point me in the right direction
> where if I’m doing something wrong? I attached the subversion and patch
> urls if anyone wants to reproduce this.

Thanks for the report and the patchfile/working copy to reproduce the
problem.

Fixed in revision 6028.

Stefan

-- 
        ___
   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