[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: diff and dos line endings

From: Andreas Schwab
Subject: Re: diff and dos line endings
Date: Sat, 09 Apr 2005 16:53:24 +0200
User-agent: Gnus/5.110002 (No Gnus v0.2) Emacs/22.0.50 (gnu/linux)

Toshio <address@hidden> writes:

> If you do a diff -u --show-c-function test.c.bak test.c with the
> included files, you'll see that diff -u generates the following line in
> its output::
>   @@ -4,5 +4,5 @@ int tester()^M
> This line causes problems for patch (GNU version 2.5.4) which doesn't
> understand the \r\n at the end of that line.

I can't reproduce that problem.  Since patch just ignores everything after
the second @@ until the next newline I see no way how the CR can cause any


Andreas Schwab, SuSE Labs, address@hidden
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

reply via email to

[Prev in Thread] Current Thread [Next in Thread]