X-Recipient: archive-cygwin AT delorie DOT com
X-SWARE-Spam-Status: No, hits=-0.4 required=5.0 	tests=AWL,BAYES_50
X-Spam-Check-By: sourceware.org
Message-ID: <2744A80610EA45E5BF533E9FDDB9498E@Elshadai>
From: "Stephen Grant Brown" <sg_brown AT mcmedia DOT com DOT au>
To: "CygWin" <cygwin AT cygwin DOT com>
Subject: Fw: Diff/Emacs Issue
Date: Mon, 29 Mar 2010 11:07:38 +1100
MIME-Version: 1.0
Content-Type: multipart/mixed; 	boundary="----=_NextPart_000_0025_01CACF30.0B440F30"
X-IsSubscribed: yes
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id: <cygwin.cygwin.com>
List-Subscribe: <mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive: <http://sourceware.org/ml/cygwin/>
List-Post: <mailto:cygwin AT cygwin DOT com>
List-Help: <mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com
Delivered-To: mailing list cygwin AT cygwin DOT com

------=_NextPart_000_0025_01CACF30.0B440F30
Content-Type: text/plain;
	format=flowed;
	charset="Windows-1252";
	reply-type=original
Content-Transfer-Encoding: 7bit




> Hi All,
>
> The attached file produces the following output.
>
> ----------------------------------------------------------------------------------------
> -rw-r--r-- 1 Admin None       0 2010-03-29 10:43
> /home/Admin/Test_Setup_Diff_1.t
> xt
> -rw-r--r-- 1 Admin None 1120825 2010-03-29 10:43
> /home/Admin/Test_Setup_Diff_2.t
> xt
> --------------------------------------------------------------------------------------------
>
> Is this large diff file produced because one program is using cr & lf 
> while
> the other program just uses a cr or a lf?
>
> In Xemacs I just hit "enter", then do a destructive backspace so the file
> remains unchanged and xemacs saves it.
>
> If I am correct, how do I fix it so that the diff file just reflects the
> changes I make.
>
> Yours Sincerely Stephen Grant Brown
> 

------=_NextPart_000_0025_01CACF30.0B440F30
Content-Type: application/octet-stream;
	name="Test_Diff.sh"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="Test_Diff.sh"

# cd ~/Setup_Source

echo Removing ~/Test_Setup_Source/*
rm -rf ~/Test_Setup_Source

mkdir ~/Test_Setup_Source
echo cp -rf /usr/src/setup/setup/* ~/Test_Setup_Source/
cp -rf /usr/src/setup/setup/*  ~/Test_Setup_Source/

cp -rf /usr/src/setup/setup/.cvsignore ~/Test_Setup_Source/.cvsignore

rm ~/Test_Setup_Diff_*.txt

diff -NaurbBdEw /usr/src/setup/setup ~/Test_Setup_Source > ~/Test_Setup_Dif=
f_1.txt

xemacs ~/Test_Setup_Source/Changelog

diff -NaurbBdEw /usr/src/setup/setup ~/Test_Setup_Source > ~/Test_Setup_Dif=
f_2.txt

ls -la ~/Test_Setup_Diff_?.txt

# cd ~/Test_Setup_Source
# patch <~/Setup_Diff_1.txt

------=_NextPart_000_0025_01CACF30.0B440F30
Content-Type: text/plain; charset=us-ascii

--
Problem reports:       http://cygwin.com/problems.html
FAQ:                   http://cygwin.com/faq/
Documentation:         http://cygwin.com/docs.html
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
------=_NextPart_000_0025_01CACF30.0B440F30--