GNU logs - #7430, boring messages

Message sent to owner <at> debbugs.gnu.org, bug-gnu-emacs@HIDDEN:

Subject: bug#7430: Bug in ediff's treatment of whitespace (this time with ALL the    attachments)
Resent-From: "Tom Breton (Tehom)" <tehom@HIDDEN>
Original-Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Resent-To: owner <at> debbugs.gnu.org
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 17 Nov 2010 20:36:02 +0000
Resent-Message-ID: <handler.7430.B.129002613618334 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 7430 <at> debbugs.gnu.org
Message-ID: <fd02b175b3c089d81d39553474ad66bf.squirrel@HIDDEN>
Date: Wed, 17 Nov 2010 15:40:23 -0500
From: "Tom Breton (Tehom)" <tehom@HIDDEN>
User-Agent: SquirrelMail/1.4.19
MIME-Version: 1.0
Content-Type: multipart/mixed;boundary="----=_20101117154023_38812"
Importance: Normal
Precedence: list
Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org

------=_20101117154023_38812
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

**** Explanation of the bug:

Wordwise merging in ediff doesn't handle whitespace reasonably when
merging to a blank element.  It just plops the non-blank element at the
end of whatever whitespace it ends up with, even across line breaks.

**** How it should work (IMO)

IMO it would be more correct to infer the division of whitespace from the
whitespace around the non-blank element.

**** Instructions for reproducing it

***** General orientation
Use the attached files:

    * odd-whitespace-2-file1.{abc}.txt

    * odd-whitespace-file1.{abc}.txt

I found it useful to give each set of {a,b,c} its own directory and keep
the filenames the same across directories.  I can't attach them to this
email with directory names, though.

I found this code useful in seeing this bug, so I'm including it here.  I=
t
just starts an merge-with-ancestor with the respective files - saves time=
.
 It expects filenames of the form file1.{a,b,c}.txt in different
directories.

  (defun bug-ediff-merge-files-with-ancestor (dir)
     ""

     (interactive "DDirectory: ")
     (ediff-merge-files-with-ancestor
        (expand-file-name "file1.a.txt" dir)
        (expand-file-name "file1.b.txt" dir)
        (expand-file-name "file1.c.txt" dir)))

***** Explicit instructions

 * Merge file1.a.txt with file1.b.txt using ancestor file1.c.txt

 * "n" to go to first clash
 * "b" to partly merge - just so it's merging nicely and not seeing
   "<<<<<<" ">>>>>>" "#####Ancestor" etc
 * "=3D" to start an inferior merge
 * "a" to compare to buffer A
 * (Now in the inferior ediff)
 * "n" to go to a line that still needs to be merged to the ancestor.
   In the demo they're all of the form "Line N A".
 * "a" to try to use the version from A.
 * It doesn't merge right.  It moves "A" to another place.

Both odd-whitespace-* and odd-whitespace-2-* exhibit similar unexpected
behavior.

	Tom Breton (Tehom)





------=_20101117154023_38812
Content-Type: text/plain; name="odd-whitespace-file1.a.txt"
Content-Disposition: attachment; filename="odd-whitespace-file1.a.txt"
Content-Transfer-Encoding: quoted-printable

Line 1
Line 2
Line 3 A
Line 4
Line 5 A
Line 6
Line 7 A
Line 8
Line 9
Line 10
------=_20101117154023_38812
Content-Type: text/plain; name="odd-whitespace-file1.b.txt"
Content-Disposition: attachment; filename="odd-whitespace-file1.b.txt"
Content-Transfer-Encoding: quoted-printable

Line 1
Line 2
Line 3
Line 4 B
Line 5
Line 6 B
Line 7
Line 8 B
Line 9
Line 10
------=_20101117154023_38812
Content-Type: text/plain; name="odd-whitespace-file1.c.txt"
Content-Disposition: attachment; filename="odd-whitespace-file1.c.txt"
Content-Transfer-Encoding: quoted-printable

Line 1
Line 2
Line 3
Line 4
Line 5
Line 6
Line 7
Line 8
Line 9
Line 10
------=_20101117154023_38812
Content-Type: text/plain; name="odd-whitespace-2-file1.a.txt"
Content-Disposition: attachment; filename="odd-whitespace-2-file1.a.txt"
Content-Transfer-Encoding: quoted-printable

Line 1          X
Line 2          X
Line 3 A        X
Line 4          X
Line 5 A        X
Line 6          X
Line 7 A        X
Line 8          X
Line 9          X
Line 10          X
------=_20101117154023_38812
Content-Type: text/plain; name="odd-whitespace-2-file1.b.txt"
Content-Disposition: attachment; filename="odd-whitespace-2-file1.b.txt"
Content-Transfer-Encoding: quoted-printable

Line 1          X
Line 2          X
Line 3          X
Line 4 B        X
Line 5          X
Line 6 B        X
Line 7          X
Line 8 B        X
Line 9          X
Line 10          X
------=_20101117154023_38812
Content-Type: text/plain; name="odd-whitespace-2-file1.c.txt"
Content-Disposition: attachment; filename="odd-whitespace-2-file1.c.txt"
Content-Transfer-Encoding: quoted-printable

Line 1          X
Line 2          X
Line 3          X
Line 4          X
Line 5          X
Line 6          X
Line 7          X
Line 8          X
Line 9          X
Line 10          X
------=_20101117154023_38812--

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.427 (Entity 5.427)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: "Tom Breton (Tehom)" <tehom@HIDDEN>
Subject: bug#7430: Acknowledgement (Bug in ediff's treatment of whitespace
 (this time with ALL the    attachments))
Message-ID: <handler.7430.B.129002613618334.ack <at> debbugs.gnu.org>
References: <fd02b175b3c089d81d39553474ad66bf.squirrel@HIDDEN>
X-Gnu-PR-Message: ack 7430
X-Gnu-PR-Package: emacs
Reply-To: 7430 <at> debbugs.gnu.org
Date: Wed, 17 Nov 2010 20:36:02 +0000

Thank you for filing a new bug report with GNU.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 bug-gnu-emacs@HIDDEN

If you wish to submit further information on this problem, please
send it to 7430 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
7430: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D7430
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Last modified: Mon, 25 Nov 2019 12:00:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.