On 9/29/06, Stefan Küng <tortoisesvn@gmail.com> wrote:
> Johan Appelgren wrote:
> > Hi,
> >
> > I'm using:
> >
> > TortoiseSVN 1.4.0, Build 7501 - 32 Bit , 2006/09/15 21:34:55
> > Subversion 1.4.0,
> > apr 0.9.12
> > apr-iconv 0.9.7
> > apr-utils 0.9.12
> > berkeley db 4.4.20
> > neon 0.25.5
> > OpenSSL 0.9.8b 04 May 2006
> > zlib 1.2.3
> >
> > I created the attached patch after some minor changes to
> > <svn://svn.berlios.de/mbunit/trunk/v2/mbunit/MbUnit.Framework/TestCase.cs>
> > and if I revert and then try to apply the patch it fails with the
> > following error:
> >
> > ---------------------------
> > TortoiseMerge
> > ---------------------------
> > The patch seems outdated! The file line
> > /// <param name="name">
> > and the patchline
> > /// Name of the test case
> > do not match!
> > ---------------------------
> > OK
> > ---------------------------
> >
> > The repository path I have checked out is
> > <svn://svn.berlios.de/mbunit/trunk/v2>.
>
> The reason TortoiseMerge can't apply your patch is because the file
> /v2/mbunit/MbUnit.Framework/TestCase.cs
> has several lines ending with CR only instead of LF or CRLF. CR only
> lineendings are not supported by TortoiseMerge.
Okey. I wasn't aware of that. Thanks.
/Johan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Oct 1 15:08:14 2006