From MAILER-DAEMON Sat Apr 02 23:18:05 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q6DpF-0003bb-UM
	for mharc-bug-diffutils@gnu.org; Sat, 02 Apr 2011 23:18:05 -0400
Received: from [140.186.70.92] (port=38374 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q6DpA-0003bS-7I
	for bug-diffutils@gnu.org; Sat, 02 Apr 2011 23:18:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <sinofishbuaa@gmail.com>) id 1Q6Dp5-0001Tz-9l
	for bug-diffutils@gnu.org; Sat, 02 Apr 2011 23:18:00 -0400
Received: from mail-qw0-f41.google.com ([209.85.216.41]:55422)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sinofishbuaa@gmail.com>) id 1Q6Dp5-0001Tt-3U
	for bug-diffutils@gnu.org; Sat, 02 Apr 2011 23:17:55 -0400
Received: by qwa26 with SMTP id 26so3608542qwa.0
	for <bug-diffutils@gnu.org>; Sat, 02 Apr 2011 20:17:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:sender:from:date
	:x-google-sender-auth:message-id:subject:to:content-type;
	bh=rP0CEbyJJPeiPfhpJMXXhaSJWLkhK/1au4sgxb2EJT4=;
	b=BsrfJ/fNU6WMrYmcKi38uJW2Yw5aZflYsKxlA6F8QK3TuxwicPENAvMCKIF2D6As+J
	+DJp7t3YY71zWGMskiO/QpVbK485ufv6bsfJTfirciOG4c9IS3BY8xbMhheDJwBjdKmU
	OwHtQyQQ8MXxypK0boP2G+9q6Cu+buZ3T8OHY=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:sender:from:date:x-google-sender-auth:message-id
	:subject:to:content-type;
	b=mGrKkLLD6uzSMPFfGh2LubDvRN3D5KeQqQMWey3AIkyvxRUcUFEhlEmFE3ph+6dGDh
	dP6ZwzN6A7XNml74Q+/WOJCR3BBDmen5JINIesAJfNe09dV73N4CpsserKvAiu50ovCa
	0zodd6OLmoPAma2avT2bItG+oVE2Jdg1826cg=
Received: by 10.229.79.196 with SMTP id q4mr4687467qck.132.1301800674397; Sat,
	02 Apr 2011 20:17:54 -0700 (PDT)
MIME-Version: 1.0
Sender: sinofishbuaa@gmail.com
Received: by 10.229.69.196 with HTTP; Sat, 2 Apr 2011 20:17:34 -0700 (PDT)
From: Kai YU <yukai@nlsde.buaa.edu.cn>
Date: Sun, 3 Apr 2011 11:17:34 +0800
X-Google-Sender-Auth: hXlBKWmSaCpswxOb4Wghut_mAzs
Message-ID: <BANLkTinA-QMD+thu+9jUk0rnsbyUGu2eiw@mail.gmail.com>
To: bug-diffutils@gnu.org
Content-Type: multipart/alternative; boundary=001636426b41c40fd6049ffb16f1
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 209.85.216.41
Subject: [bug-diffutils] Question about checkout and compilation using git
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Apr 2011 03:18:05 -0000

--001636426b41c40fd6049ffb16f1
Content-Type: text/plain; charset=ISO-8859-1

 Hi, I'm currently investigating how to fight software regressions with git
bisect. I git clone diffutils and type "git checkout v2.9" to switch to the
version 2.9 and the compilation is successful. However, when I use "git
checkout v2.8" to switch to the version 2.8 it fails to compile. Can anybody
tell me how to do it?

Looking forward to your reply, thank you.

--001636426b41c40fd6049ffb16f1
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

 Hi, I&#39;m currently investigating how to fight software regressions with=
 git bisect. I git clone diffutils and type &quot;git checkout v2.9&quot; t=
o switch to the version 2.9 and the compilation is successful. However, whe=
n I use &quot;git checkout v2.8&quot; to switch to the version 2.8 it fails=
 to compile. Can anybody tell me how to do it?<br>

<br>Looking forward to your reply, thank you.<br>

--001636426b41c40fd6049ffb16f1--


From MAILER-DAEMON Sat Apr 09 07:15:26 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q8W8U-0005li-FB
	for mharc-bug-diffutils@gnu.org; Sat, 09 Apr 2011 07:15:26 -0400
Received: from [140.186.70.92] (port=60954 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q8W8L-0004Gk-Bg
	for bug-diffutils@gnu.org; Sat, 09 Apr 2011 07:15:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1Q8W4g-00065B-93
	for bug-diffutils@gnu.org; Sat, 09 Apr 2011 07:12:05 -0400
Received: from mail-iy0-f169.google.com ([209.85.210.169]:34248)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1Q8W4g-000655-4p
	for bug-diffutils@gnu.org; Sat, 09 Apr 2011 07:11:30 -0400
Received: by iyf13 with SMTP id 13so5599971iyf.0
	for <bug-diffutils@gnu.org>; Sat, 09 Apr 2011 04:11:29 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:in-reply-to:references:date
	:message-id:subject:from:to:content-type:content-transfer-encoding;
	bh=Owvyull/ce3kT9FzPm0o2cFyXBsJVKj6HHHo26DJvo4=;
	b=VQ84kKidyrHSIC+saUHvM6eigixZ7I0YOh6e9ESmBdJIWbGGe+xd82w/MJJW3Nd4YY
	BIbhuVEX0oAw3JKaJZQyYQ6bwgSjklD1TpGy/qsrHxUlUhwZ7FlQMCaHH9iYSHBATFBE
	xh854s5BRpu/wUv9+tyjYDr07sS48NYHsf9e4=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:content-type:content-transfer-encoding;
	b=xpDKg91MRHqgw4MTQuLuwUOliPMrLw5ihXdBdJnzReYqLn1LYJI/VZYAx8j9JGOvQB
	+gzrOzJGEwt+958DNMB19ddxKt1EN+fDPy0NCMjlr+xLJ/UEgPl9Zn3Z9/aqESyqMuKe
	3gI2IaYgyNN5tpQnxUV8VzYE/1etIocmUV8sw=
MIME-Version: 1.0
Received: by 10.231.21.146 with SMTP id j18mr3244043ibb.24.1302347489038; Sat,
	09 Apr 2011 04:11:29 -0700 (PDT)
Received: by 10.231.32.66 with HTTP; Sat, 9 Apr 2011 04:11:28 -0700 (PDT)
In-Reply-To: <AANLkTimW3J1NdNh4ymisvfGWrhh7FoFhZbrfxRjbQz2N@mail.gmail.com>
References: <AANLkTimW3J1NdNh4ymisvfGWrhh7FoFhZbrfxRjbQz2N@mail.gmail.com>
Date: Sat, 9 Apr 2011 13:11:28 +0200
Message-ID: <BANLkTinLEvAF4rEKU5jdGT-mq+v0zdA4Yw@mail.gmail.com>
From: Michael Brand <michael.ch.brand@gmail.com>
To: bug-diffutils@gnu.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 209.85.210.169
Subject: [bug-diffutils] Re: diff: ignore empty lines during *alignment* of
	lines?
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Apr 2011 11:15:24 -0000

Hi again

I would be happy if someone could look into this. Maybe I was not
clear enough before and also examples in unified format would have
been better. So let me explain in a different way.

diff on Solaris 5.10 outputs this:

----------------
 a
 {
-    aa1
+    aa2
+
+    aa2
 }

 b
 {
-    bb1
-}
-
-y
-{
-    yy
+    bb2
 }
----------------

and diff of GNU diffutils 2.8.1 or 3.0 outputs this:

----------------
 a
 {
-    aa1
-}
+    aa2

-b
-{
-    bb1
+    aa2
 }

-y
+b
 {
-    yy
+    bb2
 }
----------------

Now my question is: Are there options in diff of GNU diffutils that
can be used to get the same output like in the above example with diff
on Solaris 5.10?

The input files are:
----------------
a
{
    aa1
}

b
{
    bb1
}

y
{
    yy
}
----------------

----------------
a
{
    aa2

    aa2
}

b
{
    bb2
}
----------------

Michael


2011/3/23 Michael Brand <michael.ch.brand@gmail.com>:
> Hi all
>
> Is there a way to tell diff to not use any empty line, that occurs in
> both files, for alignment of the lines from both files? I tried `diff
> --side-by-side --width=3D28 diff1.txt diff2.txt' of diffutils 3.0 with
> various options and get always:
>
> ----------------
> a =A0 =A0 =A0 =A0 =A0 =A0 =A0 a
> { =A0 =A0 =A0 =A0 =A0 =A0 =A0 {
> =A0 =A0aa1 =A0 =A0 =A0| =A0 =A0 =A0aa2
> } =A0 =A0 =A0 =A0 =A0 =A0<
>
> b =A0 =A0 =A0 =A0 =A0 =A0| =A0 =A0 =A0aa2
> { =A0 =A0 =A0 =A0 =A0 =A0<
> =A0 =A0bb1 =A0 =A0 =A0<
> } =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
>
> y =A0 =A0 =A0 =A0 =A0 =A0| =A0b
> { =A0 =A0 =A0 =A0 =A0 =A0 =A0 {
> =A0 =A0yy =A0 =A0 =A0 | =A0 =A0 =A0bb2
> } =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
> ----------------
>
> but would like to get:
>
> ----------------
> a =A0 =A0 =A0 =A0 =A0 =A0 =A0 a
> { =A0 =A0 =A0 =A0 =A0 =A0 =A0 {
> =A0 =A0aa1 =A0 =A0 =A0| =A0 =A0 =A0aa2
> =A0 =A0 =A0 =A0 =A0 =A0 >
> =A0 =A0 =A0 =A0 =A0 =A0 > =A0 =A0 =A0aa2
> } =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
>
> b =A0 =A0 =A0 =A0 =A0 =A0 =A0 b
> { =A0 =A0 =A0 =A0 =A0 =A0 =A0 {
> =A0 =A0bb1 =A0 =A0 =A0| =A0 =A0 =A0bb2
> } =A0 =A0 =A0 =A0 =A0 =A0<
> =A0 =A0 =A0 =A0 =A0 =A0 <
> y =A0 =A0 =A0 =A0 =A0 =A0<
> { =A0 =A0 =A0 =A0 =A0 =A0<
> =A0 =A0yy =A0 =A0 =A0 <
> } =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
> ----------------
>
> just similar to what I can get already now if I remove all empty lines
> in the input files, shown in this output:
>
> ----------------
> a =A0 =A0 =A0 =A0 =A0 =A0 =A0 a
> { =A0 =A0 =A0 =A0 =A0 =A0 =A0 {
> =A0 =A0aa1 =A0 =A0 =A0| =A0 =A0 =A0aa2
> =A0 =A0 =A0 =A0 =A0 =A0 > =A0 =A0 =A0aa2
> } =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
> b =A0 =A0 =A0 =A0 =A0 =A0 =A0 b
> { =A0 =A0 =A0 =A0 =A0 =A0 =A0 {
> =A0 =A0bb1 =A0 =A0 =A0| =A0 =A0 =A0bb2
> } =A0 =A0 =A0 =A0 =A0 =A0<
> y =A0 =A0 =A0 =A0 =A0 =A0<
> { =A0 =A0 =A0 =A0 =A0 =A0<
> =A0 =A0yy =A0 =A0 =A0 <
> } =A0 =A0 =A0 =A0 =A0 =A0 =A0 }
> ----------------
>
> I tried to find out myself but always only found hints like
> `--ignore-blank-lines' which do not help in my case. Removing the
> empty lines in the input is not really helpful because I would like to
> use the diff output to patch the original files or as an input for an
> editor which allows to edit the original files shown together with the
> highlighted differences.
>
> Please reply to me too because I am not subscribed to the list.
>
> Michael


From MAILER-DAEMON Sat Apr 09 20:14:26 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q8iIM-0001FI-2x
	for mharc-bug-diffutils@gnu.org; Sat, 09 Apr 2011 20:14:26 -0400
Received: from [140.186.70.92] (port=51320 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q8XgS-0006MD-Or
	for bug-diffutils@gnu.org; Sat, 09 Apr 2011 08:54:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ozgentas@gmail.com>) id 1Q8XgR-00025l-Pk
	for bug-diffutils@gnu.org; Sat, 09 Apr 2011 08:54:36 -0400
Received: from mail-bw0-f41.google.com ([209.85.214.41]:64449)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ozgentas@gmail.com>) id 1Q8XgR-00025h-H4
	for bug-diffutils@gnu.org; Sat, 09 Apr 2011 08:54:35 -0400
Received: by bwz17 with SMTP id 17so4029264bwz.0
	for <bug-diffutils@gnu.org>; Sat, 09 Apr 2011 05:54:34 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:date:message-id:subject:from:to
	:content-type; bh=XNkZVvq7MGtbL5YDpKWAUr323PvRpx8Fx+Kgq2ntM/g=;
	b=p4YlWygPc+Rc8dK/S+IsU4FhFjeeMZvJZ6YMAZau6a1HpF7xAiniBfTepuT4lcD//t
	OLTX2u9pUax3GN1EvlLcT4vxMiVrSq1ZVpGYPju3QHPWF+QkWJJR1tGN8oWmGdGqnuKD
	lX/7pgfakxyg1PSZAh1aOviCEO1sN0jCFb6lw=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:date:message-id:subject:from:to:content-type;
	b=bUj5Uf602HyTFADWeZy3CEeXnE8sf5a7K27DUmojtCJ3FnMs8/P+So2II/eEA8F/Sd
	GCRo8FWBywUFO4dq2C1Cb57NjRTopEFaqLrL8qVkk9Tb5nkU94eeYelcsmi7ypirgaVC
	DbUXWuWbl0VPhI+3M5m29E/yfPdLekzdxdtS8=
MIME-Version: 1.0
Received: by 10.204.81.203 with SMTP id y11mr2986441bkk.124.1302353674432;
	Sat, 09 Apr 2011 05:54:34 -0700 (PDT)
Received: by 10.204.179.84 with HTTP; Sat, 9 Apr 2011 05:54:34 -0700 (PDT)
Date: Sat, 9 Apr 2011 15:54:34 +0300
Message-ID: <BANLkTimHsyDKCx9iZ6+vks2tSXv=WBEiGg@mail.gmail.com>
From: Ege Ozgentas <ozgentas@gmail.com>
To: bug-diffutils@gnu.org
Content-Type: multipart/alternative; boundary=0016e6d9765122f0f204a07bd8c4
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 209.85.214.41
X-Mailman-Approved-At: Sat, 09 Apr 2011 20:14:24 -0400
Subject: [bug-diffutils] diff for MS windows gives memory error
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Apr 2011 12:54:37 -0000

--0016e6d9765122f0f204a07bd8c4
Content-Type: text/plain; charset=ISO-8859-1

Hello
I tried to use diff with windows XP professional and during comparison of
two big directories program stopped and give error message "memory
exhausted". It happened every time I tried to use the program. My compute
has 2 GB memory.
Thank you

--0016e6d9765122f0f204a07bd8c4
Content-Type: text/html; charset=ISO-8859-1

<div>Hello</div>
<div>I tried to use diff with windows XP professional and during comparison of two big directories program stopped and give error message &quot;memory exhausted&quot;. It happened every time I tried to use the program. My compute has 2 GB memory.</div>

<div>Thank you</div>

--0016e6d9765122f0f204a07bd8c4--


From MAILER-DAEMON Sun Apr 10 04:17:34 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q8ppt-0006NL-SJ
	for mharc-bug-diffutils@gnu.org; Sun, 10 Apr 2011 04:17:33 -0400
Received: from [140.186.70.92] (port=54931 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q8ppk-0006M9-Aj
	for bug-diffutils@gnu.org; Sun, 10 Apr 2011 04:17:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ozgentas@gmail.com>) id 1Q8ppe-00070A-ME
	for bug-diffutils@gnu.org; Sun, 10 Apr 2011 04:17:24 -0400
Received: from mail-bw0-f41.google.com ([209.85.214.41]:51136)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ozgentas@gmail.com>) id 1Q8ppe-0006zJ-5J
	for bug-diffutils@gnu.org; Sun, 10 Apr 2011 04:17:18 -0400
Received: by bwz17 with SMTP id 17so4384490bwz.0
	for <bug-diffutils@gnu.org>; Sun, 10 Apr 2011 01:17:17 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:date:message-id:subject:from:to
	:content-type; bh=K6OzHnJmnwzwOQADSsbFJWQJL1MnGMbbl21QKTTrNIc=;
	b=sdSqCLi0wdtI/r3pAlFPlRtPU/6fESNgOPYmsSbEnKvlBJY9uubv/jtXJEq6xWK351
	BVSeXtdwl+oDfIJY9aLmks9a4e5RPTytXRKglKJBnnFuv8L0vCAYTTZd1Mphk7HV8M7L
	bzJbObJR4Zj7IQxpxibWetpIMNgQ2dZgFdsgQ=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:date:message-id:subject:from:to:content-type;
	b=b6ugQQ4bm1BWWbLi/k2aZwHpCbNfdsZLAgQuxEK+ejeegJP4iJkb6Ja1CYTPs0S2gK
	aA7CxluM9qShm1XR1yfbysfq8hO9Cxpyms3SkfCulULJ+3zPaymr0ePOSxNIC0R8ZcZf
	BLYNAL6hKzQ5G+oLom1Z1+Ew8NQf7pK6FTp3s=
MIME-Version: 1.0
Received: by 10.204.81.203 with SMTP id y11mr3601131bkk.124.1302423437191;
	Sun, 10 Apr 2011 01:17:17 -0700 (PDT)
Received: by 10.204.179.84 with HTTP; Sun, 10 Apr 2011 01:17:17 -0700 (PDT)
Date: Sun, 10 Apr 2011 11:17:17 +0300
Message-ID: <BANLkTikdgGD4bAdOKNhZ-o=Aph_WHM5Oig@mail.gmail.com>
From: Ege Ozgentas <ozgentas@gmail.com>
To: bug-diffutils@gnu.org
Content-Type: multipart/alternative; boundary=0016e6d9765152293b04a08c1685
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 209.85.214.41
Subject: [bug-diffutils] diff program fails
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Apr 2011 08:17:32 -0000

--0016e6d9765152293b04a08c1685
Content-Type: text/plain; charset=ISO-8859-1

Hello,
I tried to use diff (GNU diffutils) 2.8.7 for MS windows. My computer runs
with windows xp professional and have 2 GB memory. During comparing two
directories (1,8 GB each) with diff -irqaw options program stops and gives
error message: "diff: memory exhausted". How can I fix this problem? Thank
you. Ege Ozgentas

--0016e6d9765152293b04a08c1685
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

<div>Hello,</div>
<div>I tried to use diff (GNU diffutils) 2.8.7 for MS windows. My computer =
runs with windows xp professional and have 2 GB memory. During comparing tw=
o directories (1,8 GB each) with diff -irqaw options program stops and give=
s error message: &quot;diff: memory exhausted&quot;. How can I fix this pro=
blem? Thank you. Ege Ozgentas</div>

--0016e6d9765152293b04a08c1685--


From MAILER-DAEMON Fri Apr 29 14:20:50 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QFsJ8-0001WV-PO
	for mharc-bug-diffutils@gnu.org; Fri, 29 Apr 2011 14:20:50 -0400
Received: from eggs.gnu.org ([140.186.70.92]:34095)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QFsJ6-0001WO-43
	for bug-diffutils@gnu.org; Fri, 29 Apr 2011 14:20:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QFsJ4-0008Jd-Pr
	for bug-diffutils@gnu.org; Fri, 29 Apr 2011 14:20:48 -0400
Received: from mx.meyering.net ([82.230.74.64]:59418)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QFsJ4-0008JX-Jc
	for bug-diffutils@gnu.org; Fri, 29 Apr 2011 14:20:46 -0400
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 0A51A603CF; Fri, 29 Apr 2011 20:20:44 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Fri, 29 Apr 2011 20:20:44 +0200
Message-ID: <877hacsyv7.fsf@rho.meyering.net>
Lines: 64
MIME-Version: 1.0
Content-Type: text/plain
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 82.230.74.64
Subject: [bug-diffutils] tweak README-release -- and update gnulib
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Apr 2011 18:20:49 -0000

FYI,
  [PATCH 1/2] maint: tweak README-release
  [PATCH 2/2] build: update gnulib submodule to latest

>From 95148010b4d874d59237ef1d9d9799db751b1eb1 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 29 Apr 2011 20:04:14 +0200
Subject: [PATCH 1/2] maint: tweak README-release

* README-release: Sync from grep's copy of this file.
Also pull from coreutils' copy the note about checking the
NixOS/Hydra autobuilder results.
---
 README-release |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/README-release b/README-release
index e5e14e9..e2bc341 100644
--- a/README-release
+++ b/README-release
@@ -13,6 +13,11 @@ Here are most of the steps we (maintainers) follow when making a release.
 * Ensure that you're on "master" with no uncommitted diffs.
   This should produce no output: git checkout master; git diff

+* Ensure that you've pushed all changes that belong in the release
+  and that the NixOS/Hydra autobuilder is reporting all is well:
+
+      http://hydra.nixos.org/jobset/gnu/diffutils-master
+
 * Run bootstrap one last time.  This downloads any new translations:

     ./bootstrap
@@ -39,7 +44,8 @@ Here are most of the steps we (maintainers) follow when making a release.
   it builds and passes all tests.

 * While that's happening, write the release announcement that you will
-  soon post.
+  soon post.  Start with the template, $HOME/announce-grep-X.Y
+  that was just created by that "make" command.

 Once all the builds and tests have passed,

--
1.7.5.452.gcf2d0


>From e4e232d1e361eda03966e9541ee2e05c561c74e9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 29 Apr 2011 20:16:13 +0200
Subject: [PATCH 2/2] build: update gnulib submodule to latest

---
 gnulib |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnulib b/gnulib
index 5e5009f..aaf62c6 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 5e5009f839875220d5dec7abdf5cf53d919f4d42
+Subproject commit aaf62c6aa8069d9a79fae845e1cab86755e5c763
--
1.7.5.452.gcf2d0


From MAILER-DAEMON Sat Apr 30 09:33:28 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QGAIa-0006rV-1o
	for mharc-bug-diffutils@gnu.org; Sat, 30 Apr 2011 09:33:28 -0400
Received: from eggs.gnu.org ([140.186.70.92]:36097)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QGAIY-0006qr-AH
	for bug-diffutils@gnu.org; Sat, 30 Apr 2011 09:33:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QGAIX-0000fm-Dh
	for bug-diffutils@gnu.org; Sat, 30 Apr 2011 09:33:26 -0400
Received: from mx.meyering.net ([82.230.74.64]:49351)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1QGAIX-0000fi-73
	for bug-diffutils@gnu.org; Sat, 30 Apr 2011 09:33:25 -0400
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 803D660453; Sat, 30 Apr 2011 15:33:24 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: Ege Ozgentas <ozgentas@gmail.com>
In-Reply-To: <BANLkTikdgGD4bAdOKNhZ-o=Aph_WHM5Oig@mail.gmail.com> (Ege
	Ozgentas's message of "Sun, 10 Apr 2011 11:17:17 +0300")
References: <BANLkTikdgGD4bAdOKNhZ-o=Aph_WHM5Oig@mail.gmail.com>
Date: Sat, 30 Apr 2011 15:33:24 +0200
Message-ID: <8762pvn9sr.fsf@rho.meyering.net>
Lines: 9
MIME-Version: 1.0
Content-Type: text/plain
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 82.230.74.64
Cc: bug-diffutils@gnu.org
Subject: Re: [bug-diffutils] diff program fails
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Apr 2011 13:33:27 -0000

Ege Ozgentas wrote:
> Hello,
> I tried to use diff (GNU diffutils) 2.8.7 for MS windows. My computer runs with
> windows xp professional and have 2 GB memory. During comparing two directories
> (1,8 GB each) with diff -irqaw options program stops and gives error message:
> "diff: memory exhausted". How can I fix this problem? Thank you. Ege Ozgentas

Buy more memory or split the files and compare the smaller portions
separately.


