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

TortoiseMerge apply unified diff error

From: Glenn R Heard Jr <gheard_at_zoominternet.net>
Date: 2005-12-14 19:32:36 CET


I made a unified diff with this version of cygwin diff:
>diff -version
    diff (GNU diffutils) 2.8.7
    Written by Paul Eggert, Mike Haertel, David Hayes,
    Richard Stallman, and Len Tower.

Using: diff -u file1.c file2.c > file3.c.diff

When I tried to apply the diff using TortoiseMerge, I get the attached error

My version of TortoiseMerge is:

    TortoiseMerge 1.2.6, Build 4786 - 32 Bit
    libsvn_diff 1.2.3,
    apr 0.9.6
    apr-iconv 0.9.5
    apr-utils 0.9.6

What am I doing wrong?

Glenn Heard gheard@altronicinc.com
Software Engineer gheard@zoominternet.net
Altronic Inc. rayzer@zoominternet.net
ICQ: 123194600 www.altronicinc.com
Y!: glennheard

"I do not fear computers. I fear lack of them."
-Isaac Asimov

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

Received on Wed Dec 14 19:37:22 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.