5:13 p.m.
Hello,
Whenever I want to merge two files, I can select the first portion of =
code to be used from A or B by pressing the required A or B in the ediff =
panel but then when I press the space bar to go to the next difference, =
I get an error :-
c:Program FilesXEmacsXEmacs-21.4.11i586-pc-win32diff3.exe: diff error:=20
Many times, I cannot even select the first difference, ediff crashes as =
soon as I press a key in its panel.
Yes, this means that diff is acting up. This is not an ediff error.
What is this error due to ? I am unable to merge files. Is there some
=
problem in the diff routines.
Another thing is that if a want to compare two directories, it shows a =
browser which wants a file as input not a directory so I am unable to =
compare directories. I will be thankful if you can suggest anything to =
solve these problems.
The about box says I am using version 21.4. I am using Windows XP.
thanks
Dhiraj
If you use ediff-directories, then ediff is asking for directories, not files.
I don't have a windows version of xemacs, but it must be a problem with
the windows port of XEmacs.
--michael
10:12 p.m.
New subject: Comparing and merging - ediff errors
>>>> "Michael" == Michael Kifer
<kifer(a)cs.sunysb.edu> writes:
> Hello,
> Whenever I want to merge two files, I can select the first portion of =
> code to be used from A or B by pressing the required A or B in the ediff =
> panel but then when I press the space bar to go to the next difference, =
> I get an error :-
> c:Program FilesXEmacsXEmacs-21.4.11i586-pc-win32diff3.exe: diff error:=20
Hi Dhiraj,
looks like some quoting issue is involved here.
ediff works well for me in (emacs-version)
"XEmacs 21.5 (beta14) \"cassava\" [Lucid] (i586-pc-win32, Mule) of Sat
Jul 05 2003 on D5DC120J"
and has been working well all along at least since the 21.1 series.
I have these customizations:
ediff-diff-program
"diff"
ediff-diff-options
"--binary "
Do you have cygwin installed?
I use
CYGWIN_NT-5.0 D5DC120J 1.3.12(0.54/3/2) 2002-07-06 02:16 i686 unknown
diff (GNU diffutils) 2.8.1
Copyright (C) 2002 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.
Written by Paul Eggert, Mike Haertel, David Hayes,
Richard Stallman, and Len Tower.
> Many times, I cannot even select the first difference, ediff
crashes as =
> soon as I press a key in its panel.
Michael> Yes, this means that diff is acting up. This is not an
Michael> ediff error.
> What is this error due to ? I am unable to merge files. Is there
some =
> problem in the diff routines.
> Another thing is that if a want to compare two directories, it shows a =
> browser which wants a file as input not a directory so I am unable to =
> compare directories. I will be thankful if you can suggest anything to =
> solve these problems.
> The about box says I am using version 21.4. I am using Windows XP.
> thanks
> Dhiraj
Michael> If you use ediff-directories, then ediff is asking for
Michael> directories, not files. I don't have a windows version
Michael> of xemacs, but it must be a problem with the windows port
Michael> of XEmacs.
ediff-directories works for me too (I couldn't survive without it) in
native Windows XEmacs.
I use these customizations:
ediff-cmp-options
("--ignore-matching-lines=\\$AutoGeneratedBy:"
"--ignore-matching-lines=^<!-- Created"
"--ignore-matching-lines=\\<\\(RfId\\|Hvd\\(Exp\\)?\\)\\.pl\\>\\|page last
modified" "--ignore-matching-lines=^date:"
"--ignore-matching-lines=^\\w+, [0-9]+ \\w+ [0-9]+ [0-9]+:[0-9]+:[0-9]+"
"--brief")
ediff-cmp-program
"diff"
The --brief switch should be good enough as a starting point.
Hope this helps,
Adrian
Michael> --michael
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
6:34 a.m.
New subject: Comparing and merging - ediff errors
Hi,
Thanks a lot. I have two diff utilities. diff and diff3, did a search on
the net and it seems that diff 3 is used to compare 3 files while diff
compares 2 files. My compare function works just fine so my diff should be
ok. My merge doesn't work so there must be a problem with my diff3. Actually
the error is also in diff3.exe as you can see in the error message. The
versions of both these tools are 2.7, I am trying to upgrade to 2.8.1, can
you please tell me where to download prebuilt 2.8.1 diffutils for windows
(XP)(2.7 was given to me by a friend).
I am using native windows Xemacs, not cygwin. I can't use Xemacs cygwin
because I am already using cygwin( the very first cygwin) and xemacs,
XFree86 and emacs, if I download them now, don't work with it. For reasons I
don't want to go into I can't upgrade to the latest cygwin.
Also, when you compare directories using native Xemacs , you click on Tools,
then you go to compare and choose directories. Now you get the standard
windows filw browser which is not satisfied until you choose a file !!! So
how are you able to choose a directory, please do inform me.
thanks a lot
Dhiraj
----- Original Message -----
From: "Adrian Aichner" <adrian(a)xemacs.org>
To: "Dhiraj Gaurh" <dhiraj(a)utstar.com>
Cc: "Michael Kifer" <kifer(a)cs.sunysb.edu>; <xemacs-beta(a)xemacs.org>
Sent: Friday, July 11, 2003 2:42 AM
Subject: Re: Comparing and merging - ediff errors
>>>>> "Michael" == Michael Kifer
<kifer(a)cs.sunysb.edu> writes:
>> Hello,
>> Whenever I want to merge two files, I can select the first portion
of
=
>> code to be used from A or B by pressing the required A
or B in the
ediff =
>> panel but then when I press the space bar to go to the
next
difference, =
>> I get an error :-
>> c:Program FilesXEmacsXEmacs-21.4.11i586-pc-win32diff3.exe: diff
error:=20
Hi Dhiraj,
looks like some quoting issue is involved here.
ediff works well for me in (emacs-version)
"XEmacs 21.5 (beta14) \"cassava\" [Lucid] (i586-pc-win32, Mule) of Sat
Jul 05 2003 on D5DC120J"
and has been working well all along at least since the 21.1 series.
I have these customizations:
ediff-diff-program
"diff"
ediff-diff-options
"--binary "
Do you have cygwin installed?
I use
CYGWIN_NT-5.0 D5DC120J 1.3.12(0.54/3/2) 2002-07-06 02:16 i686 unknown
diff (GNU diffutils) 2.8.1
Copyright (C) 2002 Free Software Foundation, Inc.
This program comes with NO WARRANTY, to the extent permitted by law.
You may redistribute copies of this program
under the terms of the GNU General Public License.
For more information about these matters, see the file named COPYING.
Written by Paul Eggert, Mike Haertel, David Hayes,
Richard Stallman, and Len Tower.
>> Many times, I cannot even select the first difference, ediff
crashes
as =
>> soon as I press a key in its panel.
Michael> Yes, this means that diff is acting up. This is not an
Michael> ediff error.
>> What is this error due to ? I am unable to merge files. Is there
some
=
>> problem in the diff routines.
>> Another thing is that if a want to compare two directories, it
shows a
=
>> browser which wants a file as input not a directory so I
am unable
to =
>> compare directories. I will be thankful if you can
suggest anything
to =
>> solve these problems.
>> The about box says I am using version 21.4. I am using Windows XP.
>> thanks
>> Dhiraj
Michael> If you use ediff-directories, then ediff is asking for
Michael> directories, not files. I don't have a windows version
Michael> of xemacs, but it must be a problem with the windows port
Michael> of XEmacs.
ediff-directories works for me too (I couldn't survive without it) in
native Windows XEmacs.
I use these customizations:
ediff-cmp-options
("--ignore-matching-lines=\\$AutoGeneratedBy:"
"--ignore-matching-lines=^<!-- Created"
"--ignore-matching-lines=\\<\\(RfId\\|Hvd\\(Exp\\)?\\)\\.pl\\>\\|page last
modified" "--ignore-matching-lines=^date:"
"--ignore-matching-lines=^\\w+,
[0-9]+ \\w+ [0-9]+ [0-9]+:[0-9]+:[0-9]+" "--brief")
ediff-cmp-program
"diff"
The --brief switch should be good enough as a starting point.
Hope this helps,
Adrian
Michael> --michael
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
7806
days inactive
7807
days old
2 comments
3 participants
participants (3)
-
Adrian Aichner -
Dhiraj Gaurh -
Michael Kifer