kdiff3-user — User questions about KDiff3.

Re: [Kdiff3-user] RFEs

[Joachim E. <joa...@gm...>]

Hi Marc-Antoine,

Am Dienstag, 23. August 2005 19:47 schrieb Marc-Antoine Ruel:
> I just wanted to tell that I added many RFEs but that I will try to
> implement them if my schedule permits me to.

That would be cool.

> The requests 1266400, 1266393 and 1266417 are the one I find the most
> important.

> I'm looking to build kdiff3. I downloaded QT 4.01 open source version for
> windows and installed mingw even if you tell in the readme that you used
> VC.

I'm working on a KDiff3-port for Qt4. It already works except for some 
details. But I must still test it under Windows too, then I'll publish it.

> I generated the makefile (with qmake) and I saw that it use g++ and not the
> VC's compiler. Maybe it is QT that configured the makefile this way. Anyway
> I got compile errors if I use the makefile.qt. When I use the
> Makefile.release (generated by qmake), make tells that it is unable to make
> release\diff.moc.

> I tried with nmake and mingw32-make.
> Should I try with QT 3.xx instead?

Yes. The current KDiff3-version requires Qt3.x (x>=2)

Cheers,
Joachim

[Kdiff3-user] RFEs

[Marc-Antoine R. <ma...@un...>]

Hi

 

I just wanted to tell that I added many RFEs but that I will try to
implement them if my schedule permits me to.

 

The requests 1266400, 1266393 and 1266417 are the one I find the most
important.

 

I'm looking to build kdiff3. I downloaded QT 4.01 open source version for
windows and installed mingw even if you tell in the readme that you used VC.

 

I generated the makefile (with qmake) and I saw that it use g++ and not the
VC's compiler. Maybe it is QT that configured the makefile this way. Anyway
I got compile errors if I use the makefile.qt. When I use the
Makefile.release (generated by qmake), make tells that it is unable to make
release\diff.moc.

 

I tried with nmake and mingw32-make.

 

Should I try with QT 3.xx instead?

 

M-A

RE: [Kdiff3-user] End of line chars when merging

[Stephen D. <sda...@es...>]

Hi Joachim,=20

> I assume you are aware of the option "Line end style" in the=20
> KDiff3 editor options. This of course sets the line end style=20
> for all merged files.

Sorry I hadn't spotted that one. This is sufficient for me. Thanks.
Being able to override it on the command line might be useful.

> Currently autodetection is not implemented. It's probably not=20
> that hard.
> But if one file has one style and the other file has the=20
> another line end style then a user query would be necessary.

Asking the user when there is a mismatch is probably sensible.

But you could consider the line-end (at least the CR) to be part of the
line, and perform the diff/merge including them. =20

Looking at the source, there is the KDiff3 Diff/merge option which
seems to essentially do the above on the inputs:
  m_pOptionDialog->m_bPreserveCarriageReturn
but when merging, the result seems to loose any CRs that were preserved.
(It is also not possible to see the CRs - as far as I can tell, even
with show whitespace enabled)

Out of interest I tried a test on bc2, and it seems to recognize the
difference in ending (when show whitespace is selected), but when I
transfer a line from the dos file to the unix file, it also seems to
have lost track that that line had dos line endings. Attached png shows
the effect.

> Let's see ...

Thanks,
 Stephen

PS I also noticed that in the merge output window, tabs can't be=20
distinguished from spaces even when whitespace display is enabled.

Re: [Kdiff3-user] End of line chars when merging

[Joachim E. <joa...@gm...>]

Hi Stephen,

I assume you are aware of the option "Line end style" in the KDiff3 editor 
options. This of course sets the line end style for all merged files.

Currently autodetection is not implemented. It's probably not that hard.
But if one file has one style and the other file has the another line end 
style then a user query would be necessary.
Let's see ...

Cheers,
Joachim


Am Donnerstag, 11. August 2005 11:14 schrieb Stephen Darnell:
> I'm running on Windows, and working on files that have
> Unix line endings.  But when I come to do a merge, the
> result seems to be written out with DOS line endings, and
> this sadly screws up other stuff.
>
> Would it be possible for KDiff3 to detect the line endings
> on the sources, and by default output in the same mode?
> (I guess the opposite issue might occur for unix users, but
> it is less likely to occur in practice)
>
> Alternatively, if kdiff3 merged the files including the line
> endings that would presumably give the best result?
> For example, merging files where some of the line endings
> have been changed/fixed.
>
> Failing that, a less than ideal, but workable solution in this
> instance would be an extra command line option to say what line
> endings to write the output in.
>
> Regards,
>   Stephen
>
>
>
> -------------------------------------------------------
> SF.Net email is Sponsored by the Better Software Conference & EXPO
> September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
> Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
> Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] End of line chars when merging

[Stephen D. <sda...@es...>]

I'm running on Windows, and working on files that have
Unix line endings.  But when I come to do a merge, the
result seems to be written out with DOS line endings, and
this sadly screws up other stuff.

Would it be possible for KDiff3 to detect the line endings
on the sources, and by default output in the same mode?
(I guess the opposite issue might occur for unix users, but
it is less likely to occur in practice)

Alternatively, if kdiff3 merged the files including the line
endings that would presumably give the best result?
For example, merging files where some of the line endings
have been changed/fixed.

Failing that, a less than ideal, but workable solution in this
instance would be an extra command line option to say what line
endings to write the output in.

Regards,
  Stephen

Re: [Kdiff3-user] resolving conflicts from cvs

[Joachim E. <joa...@gm...>]

Hi,
Thanks for your suggestion. It's already on my todo-list.
Cheers,
Joachim

Am Montag, 1. August 2005 12:26 schrieb Krzysztof Nowak:
> Hello, it woul be very nice to support resolving conflicts on
> CVS-controlled files.
> Instead of loading two different files for merge it must load one file
> and parse CVS conflict tags, for example:
>
> // App command to run the dialog
> void CGDIBenchmarkApp::OnAppAbout()
> {
> <<<<<<< GDIBenchmark.cpp
>     CAboutDlg aboutDlgXX234;
>     aboutDlgXX243.DoModal();
> =======
>     CAboutDlg aboutDlg8;
>     aboutDlg8.DoModal();
>
> >>>>>>> 1.5
>
> }
>
>
> Regards,
>
> Krzysztof
>
>
> -------------------------------------------------------
> SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
> from IBM. Find simple to follow Roadmaps, straightforward articles,
> informative Webcasts and more! Get everything you need to get up to
> speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] resolving conflicts from cvs

[Krzysztof N. <kn...@ux...>]

Hello, it woul be very nice to support resolving conflicts on
CVS-controlled files.
Instead of loading two different files for merge it must load one file
and parse CVS conflict tags, for example:

// App command to run the dialog
void CGDIBenchmarkApp::OnAppAbout()
{
<<<<<<< GDIBenchmark.cpp
    CAboutDlg aboutDlgXX234;
    aboutDlgXX243.DoModal();
=======
    CAboutDlg aboutDlg8;
    aboutDlg8.DoModal();
>>>>>>> 1.5
}


Regards,

Krzysztof

Re: [Kdiff3-user] TortoiseSVN bindings for KDiff3

[Joachim E. <joa...@gm...>]

Hi Lieven,

Thanks for your patch. I will use it in the next version of KDiff3.

Cheers,
Joachim

RE: [Kdiff3-user] Ignore C comments on directory compare

[GOVAERTS L. <Lie...@po...>]

Great, that did it.

Thanks a lot.

Lieven.

-----Original Message-----
From: Michael Denio [mailto:Mic...@mo...]=20
Sent: dinsdag 26 juli 2005 15:57
To: GOVAERTS Lieven
Cc: kdi...@li...
Subject: Re: [Kdiff3-user] Ignore C comments on directory compare

On Tue, Jul 26, 2005 at 09:17:19AM -0400, GOVAERTS Lieven wrote:
> Hi,
>=20
> =20
>=20
> I?m using KDiff3 on WinXP. I want to compare two directories on my
disk,
> containing two versions of a
>=20
> Library written in C. My goal is to find the changes in the source
code between
> those versions.
>=20
> =20
>=20
> Unfortunately, the developers have changed some line in the header (
the
> copyright notice ), so all the
>=20
> Files have been changed between those releases, but most of them only
in the
> header comments.
>=20
> =20
>=20
> I don?t want to see those files in the directory compare windows as
being
> changed, so I enabled the
>=20
> ?Ignore C/C++ comment? option. This didn?t do what I want it to do (
in fact,
> it doesn?t seem to do anything
>=20

Use "Full analysis" and check "White space differences considered
equal".


--=20
Michael Denio (Mic...@mo...)
Market Making Development



STRICTLY PERSONAL AND CONFIDENTIAL=0D
This message may contain confidential and proprietary material for the so=
le use of the intended recipient. Any review or distribution by others is=
 strictly prohibited. If you are not the intended recipient please contac=
t the sender and delete all copies.=0D
=0D
Dit bericht is enkel bestemd voor de aangeduide ontvangers en kan vertrou=
welijke informatie bevatten. Als u niet de ontvanger bent, dan mag u de i=
nhoud van dit bericht niet bekendmaken noch kopi=EBren. Als u dit bericht=
 per vergissing ontvangen heeft, gelieve er de afzender of De Post onmidd=
ellijk van op de hoogte te brengen en het bericht vervolgens te verwijder=
en.=0D
=0D
Ce message est uniquement destin=E9 aux destinataires indiqu=E9s et peut =
contenir des informations confidentielles. Si vous n'=EAtes pas le destin=
ataire, vous ne devez pas r=E9v=E9ler le contenu de ce message ou en pren=
dre copie. Si vous avez re=E7u ce message par erreur, veuillez en informe=
r l'exp=E9diteur, ou La Poste imm=E9diatement, avant de le supprimer.

Re: [Kdiff3-user] Ignore C comments on directory compare

[Michael D. <Mic...@mo...>]

On Tue, Jul 26, 2005 at 09:17:19AM -0400, GOVAERTS Lieven wrote:
> Hi,
> 
>  
> 
> I?m using KDiff3 on WinXP. I want to compare two directories on my disk,
> containing two versions of a
> 
> Library written in C. My goal is to find the changes in the source code between
> those versions.
> 
>  
> 
> Unfortunately, the developers have changed some line in the header ( the
> copyright notice ), so all the
> 
> Files have been changed between those releases, but most of them only in the
> header comments.
> 
>  
> 
> I don?t want to see those files in the directory compare windows as being
> changed, so I enabled the
> 
> ?Ignore C/C++ comment? option. This didn?t do what I want it to do ( in fact,
> it doesn?t seem to do anything
> 

Use "Full analysis" and check "White space differences considered
equal".


-- 
Michael Denio (Mic...@mo...)
Market Making Development

[Kdiff3-user] Ignore C comments on directory compare

[GOVAERTS L. <Lie...@po...>]

Hi,=20

=20

I'm using KDiff3 on WinXP. I want to compare two directories on my disk,
containing two versions of a

Library written in C. My goal is to find the changes in the source code
between those versions.

=20

Unfortunately, the developers have changed some line in the header ( the
copyright notice ), so all the

Files have been changed between those releases, but most of them only in
the header comments.

=20

I don't want to see those files in the directory compare windows as
being changed, so I enabled the

'Ignore C/C++ comment' option. This didn't do what I want it to do ( in
fact, it doesn't seem to do anything

at all ). Example of those comments:

=20

File in the 'left' folder:

/* abandon.c */

/* $OpenLDAP: pkg/ldap/libraries/libldap/abandon.c,v 1.31.2.4 2004/02/23
22:08:05 kurt Exp $ */

/* This work is part of OpenLDAP Software <http://www.openldap.org/>.

 *

 * Copyright 1998-2004 The OpenLDAP Foundation.

 * All rights reserved.

=20

File in the 'right' folder:

/* abandon.c */

/* $OpenLDAP: pkg/ldap/libraries/libldap/abandon.c,v 1.31.2.5 2005/01/20
17:01:01 kurt Exp $ */

/* This work is part of OpenLDAP Software <http://www.openldap.org/>.

 *

 * Copyright 1998-2005 The OpenLDAP Foundation.

 * All rights reserved.

=20

Can anyone explain how I can avoid these files showing up in the
directory compare window?

=20

Regards,

=20

Lieven.

=20

=20



STRICTLY PERSONAL AND CONFIDENTIAL=0D
This message may contain confidential and proprietary material for the so=
le use of the intended recipient. Any review or distribution by others is=
 strictly prohibited. If you are not the intended recipient please contac=
t the sender and delete all copies.=0D
=0D
Dit bericht is enkel bestemd voor de aangeduide ontvangers en kan vertrou=
welijke informatie bevatten. Als u niet de ontvanger bent, dan mag u de i=
nhoud van dit bericht niet bekendmaken noch kopi=EBren. Als u dit bericht=
 per vergissing ontvangen heeft, gelieve er de afzender of De Post onmidd=
ellijk van op de hoogte te brengen en het bericht vervolgens te verwijder=
en.=0D
=0D
Ce message est uniquement destin=E9 aux destinataires indiqu=E9s et peut =
contenir des informations confidentielles. Si vous n'=EAtes pas le destin=
ataire, vous ne devez pas r=E9v=E9ler le contenu de ce message ou en pren=
dre copie. Si vous avez re=E7u ce message par erreur, veuillez en informe=
r l'exp=E9diteur, ou La Poste imm=E9diatement, avant de le supprimer.

Re: [Kdiff3-user] Feature Suggestion

[Joachim E. <joa...@gm...>]

Am Donnerstag, 14. Juli 2005 20:26 schrieb Andrew Esh:
> How about a feature to cause kdiff3 to write out a patch file that
> contains the differences in the files it currently has in its list? I
> have to work in an environment where a patch file is required for code
> submissions. As long as kdiff3 is already showing me the list of files
> that are changed, I would like to save that set of changes as a patch
> file.

I agree, that it would be nice to have this functionality accessible from the 
KDiff3-userinterface too, but currently and for the near future this is a bit 
out of scope.
Cheers,
Joachim

[Kdiff3-user] Feature Suggestion

[Andrew E. <And...@ad...>]

How about a feature to cause kdiff3 to write out a patch file that
contains the differences in the files it currently has in its list? I
have to work in an environment where a patch file is required for code
submissions. As long as kdiff3 is already showing me the list of files
that are changed, I would like to save that set of changes as a patch
file.

-- 
Andrew C. Esh           mail:Andrew_Esh[at]adaptec.com
Adaptec, Inc.
2905 Northwest Blvd., Suite 20
Plymouth, MN 55441-2644 USA      763-551-6418 (direct)

Re: [Kdiff3-user] merge reports

[Joachim E. <joa...@gm...>]

Am Montag, 11. Juli 2005 13:52 schrieb Nick Thompson:
> Hi,
>
> In some situations, it is required to follow up a merge with other actions.
> File check-in or bug report updating for example. In these situations, it
> would be useful to know what files were merged. Of course it might well be
> possible to scan the before and after dir trees to find changed files, but
> this might a long job in a big tree.
>
> So, my suggestion: Add an option to kdiff3 to request a merge report to be
> generated on exit (stdout or file). This could list files actually merged
> (saved), files that differed but were not merged and maybe some other
> statistics. The output should be formated with an eye to it being
> automatically post-processed.
>
> What do you think?
>
> Thanks for reading...

Yes, I agree about that this would often be very useful.
It's on my todo list, but currently development is slowed down somewhat.

Nevertheless thanks for writing,
Joachim

[Kdiff3-user] merge reports

[Nick T. <nic...@ag...>]

Hi,

In some situations, it is required to follow up a merge with other actions. 
File check-in or bug report updating for example. In these situations, it 
would be useful to know what files were merged. Of course it might well be 
possible to scan the before and after dir trees to find changed files, but 
this might a long job in a big tree.

So, my suggestion: Add an option to kdiff3 to request a merge report to be 
generated on exit (stdout or file). This could list files actually merged 
(saved), files that differed but were not merged and maybe some other 
statistics. The output should be formated with an eye to it being 
automatically post-processed.

What do you think?

Thanks for reading...
-- 
> Nick Thompson
> Agere Systems Ltd

Re: [Kdiff3-user] "Try harder feature"

[Joachim E. <joa...@gm...>]

On Monday 27 June 2005 20:25, Preston, Keith wrote:
> Hello, my name is Keith Preston and I work for Engenio Information
> Technologies.   We recent incorporated your wonderful Kdiff3 program in our
> code management software (Telelogic's CM synergy)   However we are coming
> across a few simple problems with the resulting code merge.  Our biggest
> problem was when there are large chunks of code added in the middle of the
> file (1000+ lines) the matching algorithm does not always line up the code
> correctly.   I was wondering if there was an option to increase the number
> of look ahead lines in the source code as we had this same problem with
> diff3 and worked to change it.   We have experimented with the try harder
> box, but have not had good results.   I didn't know if this box searched
> farther ahead or just used a different algorithm.  Sometime it works better
> and sometime worse.
>
>
>
> Keith

Hi Keith,

I'm glad KDiff3 can help you.
About your problem: The "Try hard"-option is equivalent to the 
"--minimal"-switch of GNU-diff. This actually means that the look-ahead 
considers the whole file.

But the problem is probably that no matching algorithm can never be perfect 
for every situation and purpose. One solution that I'm currently 
investigating is to let the user help the diff tool. This would mean that the 
user can specify certain lines that must be aligned for the comparison and 
merge.

I hope, that I can get this stable for the next version.

Cheers,
Joachim

[Kdiff3-user] "Try harder feature"

[Preston, K. <kei...@en...>]

Hello, my name is Keith Preston and I work for Engenio Information Technologies.   We recent incorporated your wonderful Kdiff3 program in our code management software (Telelogic's CM synergy)   However we are coming across a few simple problems with the resulting code merge.  Our biggest problem was when there are large chunks of code added in the middle of the file (1000+ lines) the matching algorithm does not always line up the code correctly.   I was wondering if there was an option to increase the number of look ahead lines in the source code as we had this same problem with diff3 and worked to change it.   We have experimented with the try harder box, but have not had good results.   I didn't know if this box searched farther ahead or just used a different algorithm.  Sometime it works better and sometime worse.

 

Keith

 

Re: [Kdiff3-user] file open dialog

[Joachim E. <joa...@gm...>]

On Monday 16 May 2005 16:33, Robert Orr wrote:
> With KDiff3 Version 0.9.88.
>
> When I select the file open dialog,  can kdiff3 be
> setup so that it remembers the last place I looked
> for file open?

The comboboxes in the file open dialog contain the history of files that 
previously were opened via that dialog.

Joachim

Re: [Kdiff3-user] How to ignore certain differences in files

[Joachim E. <joa...@gm...>]

On Monday 16 May 2005 15:27, Robert Orr wrote:
> I have two program (VB) dirs that I compare which
> are different in many places by only the name of a
> variable (in file1 the variable is "my_var", in file2
> the variable is "My_Var").   So I get quite a few
> trivial differences that in only the name of this
> variable.
>
> Obviously, I could use sed or some other tool to
> pre-process the files, but I wonder if there isn't an
> opportunity to have an option in KDIFF3 to ignore a
> list of pre-defined differences?
>
> Any comments welcome.  Maybe this is already available
> and I'm overlooking it.
>
> Phil

Hi Phil,

Predefined options are "Ignore case", "Ignore numbers" and "Ignore 
C/C++-comments". For other things to ignore you currently need an external 
tool like sed. Possibly I'll integrate more features in future.

Joachim

[Kdiff3-user] file open dialog

[Robert O. <phi...@ya...>]

With KDiff3 Version 0.9.88.
 
When I select the file open dialog,  can kdiff3 be
setup so that it remembers the last place I looked
for file open?


		
Discover Yahoo! 
Have fun online with music videos, cool games, IM and more. Check it out! 
http://discover.yahoo.com/online.html

[Kdiff3-user] How to ignore certain differences in files

[Robert O. <phi...@ya...>]

I have two program (VB) dirs that I compare which 
are different in many places by only the name of a
variable (in file1 the variable is "my_var", in file2
the variable is "My_Var").   So I get quite a few
trivial differences that in only the name of this
variable.

Obviously, I could use sed or some other tool to
pre-process the files, but I wonder if there isn't an
opportunity to have an option in KDIFF3 to ignore a
list of pre-defined differences?

Any comments welcome.  Maybe this is already available
and I'm overlooking it.

Phil





		
__________________________________ 
Yahoo! Mail Mobile 
Take Yahoo! Mail with you! Check email on your mobile phone. 
http://mobile.yahoo.com/learn/mail 

Re: [Kdiff3-user] kdiff3 bugs and comments

[William S F. <ws...@fu...>]

Joachim Eibl wrote:
> Hi William,
> 
> On Tuesday 03 May 2005 22:42, William S Fulton wrote:
>>Firstly, thanks for a cool app, it is much appreciated. Here are some
>>comments for improvement and a bug or two.
>>
>>Keys don't work when results of a directory diff are first shown, eg
>>CTRL - right to expand directory in the file list (a non-visible window
>>seems to have the focus).
> 
> I can confirm that it can be difficult to tell if the directory window has the 
> focus. The text windows have focus when their title is drawn with the full 
> background color. But by clicking into the directory window (or by using 
> Alt-Left or Alt-Right) you can change the focus. Then this should again work 
> correctly.
> 
Seems to work okay when invoking:
   kdiff3 dir1 dir2
(the directory list has the focus, so you can use the arrow keys to move 
around, eg expanding the subdirectories) but not when invoked as
   kdiff3
then filling in the directories in the dialog.

>>The list of files is not shown when re-starting the program for
>>directory diffs. This appears to happen every second invocation of the
>>program.
> 
> Very odd. I can't reproduce that. Please specify what you mean by 
> "restarting" (what do you do and what is the state before you do it?) What 
> exactly is visible instead of the list of files?
> 
Odd indeed, it ain't doing it now. I tested this many times when I first 
posted by starting it using
   kdiff3 &
then selecting the 2 directories to diff. After which I simply closed 
the program down and repeated many times. Every second invocation showed 
the 2 files comparison side by side instead of the directory list. I had 
played a lot with the options in the Windows directory prior to this 
happening. In fact in trying to get it to occur again, I got a seg 
fault, details at end of email.

>>Biggest problem is that a bit of polish is needed to be used as a
>>directory diff tool when compared to Kompare and some other diff tools.
>>I've been using Kompare for a while, but the latest SuSE has removed
>>this package and seemingly replaced it with kdiff3.
> 
> Very odd, since the source and debuginfo packages of kdesdk3 are on 
> ftp.suse.com. (Kompare would be in kdesdk3.) Perhaps the binary is only on 
> the DVDs.
> 
Indeed, I found Kompare in the kdesdk3 package. It used to be a separate 
package on in my previous SuSE version. I hadn't ticked the 'Provides' 
search option in YaST2, so messed up on the searching.

>>There is a need for 
>>better keyboard handling so that one can easily view all the diffs
>>across all files using keyboard shortcuts. The keyboard shortcut
>>currently only work for diffs in one file. Something like ctrl UP/DOWN
>>to scroll through them all (when top window containing the filenames has
>>focus - with diffs automatically appearing in the lower half). So CTRL
>>arrow keys need to work the same as in the diff windows, but will scroll
>>through *all* files. Or use CTRL-SHIFT keys, like I recall Kompare uses.
> 
> The philosophy in KDiff3 is slightly different. Using menu 
> "Directory"->"Start/Continue Directory Merge" (F7) would allow you to compare 
> and merge several files.
> I could add something like CTRL-SHIFT-Up/Down that jumps to the next different 
> file and - like doubleclick - starts either a comparison or merge (depending 
> on whether a directory comparison or merge is running. Would you want that?
> 
Basically, I would like to use the same key presses to view all 
differences in all files. So a CTRL-SHIFT-Down could work like the 
CTRL-Down key currently does, but in addition, it goes on to the next 
file when reaching the end of the diffs in the current file.

>>Need to automatically remember and select the last files/directories
>>merged, so that I don't have to reselect them each time (when restarting
>>GUI program, so that it works like File, Open menu, which does remember
>>the last files diff'd).
> 
> The combo boxes in the open dialog remember their history. (That is all files 
> and directories that were selected via the GUI.)
> If that's not what you need, please give me more information on that topic.
> 
Remembering the history is great. The suggestion I'm making is to select 
the last one used rather than having it blank. Not really important, but 
useful for repetive diffs.

Also just noticed that when there is just one directory in the history 
(after invoking with 'kdiff3 &', the arrow keys are not able to select 
the one and only directory, but it is available when using the mouse to 
select.

>>CTRL-UP or CTRL-DOWN moves to next diff (great shortcut, but it also
>>scrolls when got to end of file. So ctrl arrow keys have two functions
>>which make it confusing to use. UP or DOWN by itself does scrolling, so
>>there isn't really a need for CTRL arrow keys to do this too.
> 
> This will be fixed in the next version.
> 
>>When selecting to show a file's differences from the list of files, the
>>2 files are opened in the bottom quarter of the screen. With one or two
>>files/directories in the listing, half the screen is showing white
>>space. Suggest, the 2 files automatically fill the wasted space or
>>remember the size of the windows since the last program invocation. Or
>>have the files fill up all of the bottom part of the program window,
>>except for showing 3 or 4 files in the top window.
> 
> I will try to implement the "remember the size"-feature.
> 
Cool.

>>Suggest, the Information dialog (with Number of subdirectories etc)
>>shown at the end of the scan has an option to be suppressed and put the
>>information in a status bar somewhere... one less tedious keypress/mouse
>>action for repetitive use of kdiff3.
> 
> You must be using KDiff3 really a lot ;-). I'll see what I can do.
Again not important, but minor improvements in useability are always 
appreciated.

William



Steps to replicate crash...

Launch as
   kdiff3 &
choose 2 directories to compare. When finished, select the "Dir and Text 
  Split Screen" option in the Windows menu (2 windows are shown with a 
vertical bar separating them). Select same menu option again (3 windows 
appear - directory listing at top with the 2 file comparisons below). 
Click the mouse in the bottom left window and ...

The application KDiff3 (kdiff3) crashed and caused the signal 11 (SIGSEGV).

Backtrace:

(no debugging symbols found)
Using host libthread_db library "/lib/tls/libthread_db.so.1".
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
(no debugging symbols found)
[KCrash handler]
#7  0x417cdc7d in DiffTextWindow::showStatusLine ()
    from /opt/kde3/lib/kde3/libkdiff3part.so
#8  0x417ce298 in DiffTextWindow::mousePressEvent ()
    from /opt/kde3/lib/kde3/libkdiff3part.so
#9  0x40c6c3f6 in QWidget::event () from /usr/lib/qt3/lib/libqt-mt.so.3
#10 0x40bd2d5f in QApplication::internalNotify ()
    from /usr/lib/qt3/lib/libqt-mt.so.3
#11 0x40bd5266 in QApplication::notify () from 
/usr/lib/qt3/lib/libqt-mt.so.3
#12 0x4085e6b1 in KApplication::notify () from /opt/kde3/lib/libkdecore.so.4
#13 0x40b7028e in QETWidget::translateMouseEvent ()
    from /usr/lib/qt3/lib/libqt-mt.so.3
#14 0x40b6f146 in QApplication::x11ProcessEvent ()
    from /usr/lib/qt3/lib/libqt-mt.so.3
#15 0x40b7fc38 in QEventLoop::processEvents ()
    from /usr/lib/qt3/lib/libqt-mt.so.3
#16 0x40beae51 in QEventLoop::enterLoop () from 
/usr/lib/qt3/lib/libqt-mt.so.3
#17 0x40beac96 in QEventLoop::exec () from /usr/lib/qt3/lib/libqt-mt.so.3
#18 0x40bd494f in QApplication::exec () from /usr/lib/qt3/lib/libqt-mt.so.3
#19 0x0804f87e in ?? ()
#20 0xbfffef10 in ?? ()
#21 0x00000001 in ?? ()
#22 0x00000001 in ?? ()
#23 0x00000000 in ?? ()
#24 0x00000000 in ?? ()
#25 0x00000001 in ?? ()
#26 0x08050ac3 in std::basic_streambuf<char, std::char_traits<char> 
 >::_S_pback_size ()
#27 0x00000000 in ?? ()
#28 0x08050ec0 in std::basic_streambuf<char, std::char_traits<char> 
 >::_S_pback_size ()
#29 0x08050aaf in std::basic_streambuf<char, std::char_traits<char> 
 >::_S_pback_size ()
#30 0xbfffef28 in ?? ()
#31 0x413ce0ee in operator new () from /usr/lib/libstdc++.so.5
#32 0x41438e80 in __libc_start_main () from /lib/tls/libc.so.6
#33 0x0804e851 in ?? ()

Re: [Kdiff3-user] kdiff3 question re. binary diff

[Joachim E. <joa...@gm...>]

On Sunday 08 May 2005 19:45, Robert Orr wrote:
> I have two directories that I diff.  In the text
> files, when there is a difference, kdiff3 acurately
> shows me the  differences.
>
> In the binary files, how does kdiff3 do the
> difference?   Does kdiff3 report the binary content as
> equal if the file sizes are equal, or does kdiff3
> actually do a byte by byte compare?

Hi,

This is an option in the directory-merge settings.
Your choices for "File Comparison Mode" are 
"Binary comparison", "Full Analysis", "Trust the modification date" and "Trust 
the size".

"Binary comparison" does the byte by byte-compare. (default)
"Trust the size" reports equality if the file sizes are equal.
"Trust the modification date" reports equality only if the date, time and size 
are equal.
"Full comparison" looks at the texts after running the preprocessors and even 
shows how many differences (and white-space differences) are there per file.

This and more is in the documentation. 
(http://kdiff3.sourceforge.net/doc/dirmergeoptions.html)

Cheers,
Joachim

[Kdiff3-user] kdiff3 question re. binary diff

[Robert O. <phi...@ya...>]

I have two directories that I diff.  In the text
files, when there is a difference, kdiff3 acurately
shows me the  differences.      

In the binary files, how does kdiff3 do the
difference?   Does kdiff3 report the binary content as
equal if the file sizes are equal, or does kdiff3
actually do a byte by byte compare?   

Thanks.   I did look through the FAQ but I didn't see
this topic in there.


		
Yahoo! Mail
Stay connected, organized, and protected. Take the tour:
http://tour.mail.yahoo.com/mailtour.html

Re: [Kdiff3-user] kdiff3 bugs and comments

[Joachim E. <joa...@gm...>]

Hi William,

On Tuesday 03 May 2005 22:42, William S Fulton wrote:
> Firstly, thanks for a cool app, it is much appreciated. Here are some
> comments for improvement and a bug or two.
>
> Keys don't work when results of a directory diff are first shown, eg
> CTRL - right to expand directory in the file list (a non-visible window
> seems to have the focus).

I can confirm that it can be difficult to tell if the directory window has the 
focus. The text windows have focus when their title is drawn with the full 
background color. But by clicking into the directory window (or by using 
Alt-Left or Alt-Right) you can change the focus. Then this should again work 
correctly.

>
> The list of files is not shown when re-starting the program for
> directory diffs. This appears to happen every second invocation of the
> program.

Very odd. I can't reproduce that. Please specify what you mean by 
"restarting" (what do you do and what is the state before you do it?) What 
exactly is visible instead of the list of files?

> Biggest problem is that a bit of polish is needed to be used as a
> directory diff tool when compared to Kompare and some other diff tools.
> I've been using Kompare for a while, but the latest SuSE has removed
> this package and seemingly replaced it with kdiff3.

Very odd, since the source and debuginfo packages of kdesdk3 are on 
ftp.suse.com. (Kompare would be in kdesdk3.) Perhaps the binary is only on 
the DVDs.

> There is a need for 
> better keyboard handling so that one can easily view all the diffs
> across all files using keyboard shortcuts. The keyboard shortcut
> currently only work for diffs in one file. Something like ctrl UP/DOWN
> to scroll through them all (when top window containing the filenames has
> focus - with diffs automatically appearing in the lower half). So CTRL
> arrow keys need to work the same as in the diff windows, but will scroll
> through *all* files. Or use CTRL-SHIFT keys, like I recall Kompare uses.

The philosophy in KDiff3 is slightly different. Using menu 
"Directory"->"Start/Continue Directory Merge" (F7) would allow you to compare 
and merge several files.
I could add something like CTRL-SHIFT-Up/Down that jumps to the next different 
file and - like doubleclick - starts either a comparison or merge (depending 
on whether a directory comparison or merge is running. Would you want that?

> Need to automatically remember and select the last files/directories
> merged, so that I don't have to reselect them each time (when restarting
> GUI program, so that it works like File, Open menu, which does remember
> the last files diff'd).

The combo boxes in the open dialog remember their history. (That is all files 
and directories that were selected via the GUI.)
If that's not what you need, please give me more information on that topic.

> CTRL-UP or CTRL-DOWN moves to next diff (great shortcut, but it also
> scrolls when got to end of file. So ctrl arrow keys have two functions
> which make it confusing to use. UP or DOWN by itself does scrolling, so
> there isn't really a need for CTRL arrow keys to do this too.

This will be fixed in the next version.

> When selecting to show a file's differences from the list of files, the
> 2 files are opened in the bottom quarter of the screen. With one or two
> files/directories in the listing, half the screen is showing white
> space. Suggest, the 2 files automatically fill the wasted space or
> remember the size of the windows since the last program invocation. Or
> have the files fill up all of the bottom part of the program window,
> except for showing 3 or 4 files in the top window.

I will try to implement the "remember the size"-feature.

> Suggest, the Information dialog (with Number of subdirectories etc)
> shown at the end of the scan has an option to be suppressed and put the
> information in a status bar somewhere... one less tedious keypress/mouse
> action for repetitive use of kdiff3.

You must be using KDiff3 really a lot ;-). I'll see what I can do.

Cheers,
Joachim