kdiff3-user — User questions about KDiff3.

[Kdiff3-user] kdiff3 feature request

[<Jus...@ac...>]

Hi peeps,

I've just started using Kdiff3 0.9.83, and it's becoming a really useful
tool.

There is one feature I'd like to request. I'll give the scenario:

There is a large file (file.c) in three directories trees, dir_a, dir_b, and
dir_c.

dir_a/file.c is the original snapshot.
dir_b/file.c is slightly modified from dir_a by me.
dir_c/file.c is heavily modified from dir_a by other people.

I'd like Kdiff3 to be able temorarily (via a toggle button) only compare,
and show the results in the bottow three input windows, of the files in
dir_a and dir_b, and ignoring the one in dir_c. 

This would make it really obvious where my changes are. Until I knew exactly
where to look, I didn't see the tiny green line in the middle of a large
amount of magenta lines in the overview column.

Thank you,
Justin.


--
Justin Skists
Software Engineer
Aculab
Tel:+44 (0) 1908 273 800
Fax:+44 (0) 1908 273 801



For Aculab's privacy policy and E-Mail disclaimer, Click Here :
http://www.aculab.com/company/legal_notice.htm. 

[Kdiff3-user] no help under WinMe

[Arnold W. <awi...@te...>]

Hi,

I've just found KDiff3 (0.9.83) and think it is very useful and makes 
the job of sorting out file differences so much easier.

I have been running it under Win95 and WinME. On Win95, I do get help 
from the menu, but when I select Help|Help under WinME, nothing happens; 
same goes for F1; Help|About does give me the 'About' box

The only problem I have been having is some apparent sensitivity to 
mixed case filenames; I have  not been able to pin down exactly which 
case is troublesome, since Windoze does not always display file names as 
they are typed or as they are recorded on disk - it does seem to like to 
capitalize the first letter depending on where it is displayed. This is 
only a minor nuisance and I have been able to avoid almost all problems 
by liberally adding patterns in the configuration.

Thanks for making it available
Arnold

[Kdiff3-user] Suggestion: kdiff3 should accept options '-u' and '-L'

[Etienne U. <eu...@pr...>]

Thank you to Joachim EIBL for the 'kdiff3' tool.


For configuration management, we use the open source 'Subversion' tool
See  http://subversion.tigris.org


This 'Subversion' tool permits to specify any program to display
differences, and uses following options of the Linux 'diff' tool=A0:
   -u         Use the unified output format
   -L label   Use label instead of the file name in the headers

See  http://www.ctssn.com/man/index.cgi?section=3Dall&topic=3Ddiff


Example=A0:

kdiff3  -u  -L "myFile.txt	(revision 11)"  -L "myFile.txt
(revision 12)"  C:\DOCUME~1\Urbah\LOCALS~1\Temp/tmp
C:\DOCUME~1\Urbah\LOCALS~1\Temp/tmp.2

In this example, 'tmp' contains revision 11 and 'tmp.2' contains
revision 12 of 'myFile.txt'.


So the 'kdiff3' tool should accept (and ignore) the option '-u', and
honor the option '-L'.


Thank you in advance.

Best regards.

-----------------------------------------------------
Etienne URBAH                         Product Manager
mailto:eu...@pr...
Tel:  +33 (0)1 56 43 40 27
Fax:  +33 (0)1 56 43 31 33
PREPAY-GO      63 rue Pierre Charron      75008 PARIS
-----------------------------------------------------

Re: [Kdiff3-user] non-standard location of help files

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

On Friday 30 April 2004 22:44, Michael Denio wrote:
> I've built a qt-only version of kdiff3 and my help files are not located
>   in usr/local/share/doc/kdiff3/en/.  How can I tell kdiff3 to look
> elsewhere?

Edit line 99 in src/kreplacements/kreplacements.cpp accordingly: Default is:
      pBrowser->setSource("/usr/local/share/doc/kdiff3/en/index.html");

Cheers,
Joachim

[Kdiff3-user] non-standard location of help files

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

Hi,

I've built a qt-only version of kdiff3 and my help files are not located 
  in usr/local/share/doc/kdiff3/en/.  How can I tell kdiff3 to look 
elsewhere?

thanks,

-- 
Michael Denio (Mic...@mo...)
Equity Trading Infrastructure

Re: [Kdiff3-user] kdiff3 command-line suggestion

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

Joachim Eibl wrote:

>>I'd love for the options to exist and be called something like
>>-label1, -label2, -label3, -labelout
> 
> 
> There already exist something similar. 
> --fname alias     Visible name replacement. Supply this once for every input.
> 
> (But I have to document it better.)
> 
> This is the syntax that was used by cleardiffmrg which KDiff3 can replace. 
> ("Documented" in main.cpp.)
> 
> But I like your idea with numbered labels because the order on the 
> command-line isn't important then.
> 

I didn't know about the fname option and just gave it a try.  I found a 
bug when the second paramter is a directory and not the complete 
filename.  In that case the --fname is ignored.

kdiff3 --fname foo --fname bar file1.c /path/to/compare

bar is not displayed

kdiff3 --fname foo --fname bar file1.c /path/to/compare/file1.c

bar is displayed

BTW, I agree it is better to have -label1, etc.


-- 
Michael Denio (Mic...@mo...)
Equity Trading Infrastructure

Re: [Kdiff3-user] kdiff3 command-line suggestion

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

> I'd love for the options to exist and be called something like
> -label1, -label2, -label3, -labelout

There already exist something similar. 
--fname alias     Visible name replacement. Supply this once for every input.

(But I have to document it better.)

This is the syntax that was used by cleardiffmrg which KDiff3 can replace. 
("Documented" in main.cpp.)

But I like your idea with numbered labels because the order on the 
command-line isn't important then.

Cheers,
Joachim

On Thursday 29 April 2004 04:16, James Manning wrote:
> kdiff3 looks very useful for 3-way merging, and I wondered if it could
> get a feature that Araxis Merge currently has.  The Araxis
> command-line has the option to specify labels to associate with the
> files which is nice in a scripting situation when you'd rather the GUI
> had a different name for the various input buffers than the filenames
> (esp. if you're just fetching stuff into temp files or whatever).
>
> I'd love for the options to exist and be called something like
> -label1, -label2, -label3, -labelout
>
> Then the code could just replace the labels of those buffers with the
> appropriate label in the cases where a label is specified.  Scripting
> situations definitely could make use of this when temp file names
> aren't very useful to the user.
>
> Is this feasible?
>
> Thanks!
>
> James
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by: Oracle 10g
> Get certified on the hottest thing ever to hit the market... Oracle 10g.
> Take an Oracle 10g class now, and we'll give you the exam FREE.
> http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] kdiff3 command-line suggestion

[James M. <jm...@su...>]

kdiff3 looks very useful for 3-way merging, and I wondered if it could
get a feature that Araxis Merge currently has.  The Araxis
command-line has the option to specify labels to associate with the
files which is nice in a scripting situation when you'd rather the GUI
had a different name for the various input buffers than the filenames
(esp. if you're just fetching stuff into temp files or whatever).

I'd love for the options to exist and be called something like
-label1, -label2, -label3, -labelout

Then the code could just replace the labels of those buffers with the
appropriate label in the cases where a label is specified.  Scripting
situations definitely could make use of this when temp file names
aren't very useful to the user.

Is this feasible?

Thanks!

James

[Kdiff3-user] Re: Great program with one simple thing missing from merge.

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

On Sunday 18 April 2004 23:43, you wrote:
> One small thing is missing from the merge facility: The ability to choose
> the lines from both file A *and* B. The need for this becomes quite
> apparent when merging a source file that has two functions that contain
> very similar but distinct code and have function names that are similar
> (and when one is in one file and the other is in the other). Kdiff3 thinks
> that they're both the same function and have just changed when what you
> want is to just have *both* sets of lines in the file. You just want to go
> to the Merge menu and select Select lines from A and B (or A, B and C).

You can activate the A/B/C-button together for each conflict. They are not 
exclusive. If you select A first and B then, then the lines of A appear above 
the lines of B etc.

Does this solve your problem?

Cheers,
Joachim

Re: [Kdiff3-user] [Wish] - Selecting the file to merge after starting program

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

On Wednesday 14 April 2004 15:32, Andre Goddard Rosa wrote:
> On Wednesday 14 April 2004 03:45, you wrote:
> > On Tuesday 13 April 2004 15:56, Andre Goddard Rosa wrote:
> > > Wish:
> > >
> > > When I click on the merge button it could merge on the selected file on
> > > the interface and not the last supplied filename.
> >
> > ??? I don't understand.
>
> I am trying to say to you that would be usefull if the file _merged_
> (the one that will be saved), could be selected between _any_ of
> the visible files that were opened.
>
> If you didnt understand I can explain you more detailed again.

Thanks. Now I think I understand. I could make several menu-entries in the 
file-menu: Besides "Save As..." there might be a "Save As A", "Save As B" and 
"Save As C".

Joachim

Re: [Kdiff3-user] [Wish] - Selecting the file to merge after starting program

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

On Tuesday 13 April 2004 15:56, Andre Goddard Rosa wrote:
> Wish:
>
> When I click on the merge button it could merge on the selected file on the
> interface and not the last supplied filename.

??? I don't understand.
The merge button starts a merge of the current data in the diff windows. 
(Which might come from the clipboard too.)

> Select a file mean to do a click on the titlebar that shows the filename.

I intend to show the common part of the input files/directories in the 
titlebar of the window.

Joachim

[Kdiff3-user] [Wish] - Selecting the file to merge after starting program

[Andre G. R. <go...@au...>]

Wish:

When I click on the merge button it could merge on the selected file on the 
interface and not the last supplied filename.

Select a file mean to do a click on the titlebar that shows the filename.


Thanks,

Andre

[Kdiff3-user] Re: Kdiff3-user digest, Vol 1 #21 - 2 msgs

[<sea...@ya...>]

> When you specify a Line-Matching-Preprocessor then
> that output goes only to 
> the diff algorithm. The real difference is then
> treated like white space 
> differences.

Excellent - that'll teach me to read the manual ;)
 
> Yes, a hex-display would be very nice.
> The diff-algorithm would have to be a different one
> though. I think the 
> algorithm from xdelta
> (http://sourceforge.net/projects/xdelta) would be
> best 
> for big files.
> If you're interested you might start by writing a
> standalone widget. If that 
> works I'll integrate it in KDiff3.

Thanks for the pointer to the algorithm. I'll have a
go if I can find some time... can't promise anything.



	
	
		
___________________________________________________________
WIN FREE WORLDWIDE FLIGHTS - nominate a cafe in the Yahoo! Mail Internet Cafe Awards  www.yahoo.co.uk/internetcafes 

[Kdiff3-user] Re: kdiff3 batch mode operation?

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

On Monday 05 April 2004 23:14, you wrote:
> Thanks for creating Kdiff3. Everyone here loves it.
>
> I was wondering if you were going to add a "batch" mode of operation, but
> then I took a look at the source and noticed references to an --auto switch
> which seems to do exactly that. I tried it out and it seemed to work ok.
> But unless I'm missing it, I don't see it documented anywhere. Is it safe
> to use?

Yes, it should be safe (although there is no guarantee for GPL-code). I only 
forgot to document this.

--auto      No GUI if all conflicts are auto-solvable. (Needs -o file)

First KDiff3 checks if only one file was changed. Then the changed file is 
used as output. (The other two files must be binary equal.)

If all three files have changed KDiff3 will try to merge automatically what is 
possible. Only if conflicts remain, then the GUI will be started.

Cheers,
Joachim

Re: [Kdiff3-user] Re: Kdiff3-user digest, Vol 1 #19 - 1 msg

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

On Monday 05 April 2004 18:40, Bernie Ogden wrote:
> > As Michael already pointed out, this can be solved
> > via a preprocessor:
> > sed
>
> "s/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/"
>
> I use sed quite a bit to preprocess files before
> diffing - the trouble is that you lose the difference
> completely. It would be quite nice to be able to treat
> it as a whitespace difference so it at least gets
> highlighted for a quick check. 

That's the difference between the normal proprocessor and the 
Line-Matching-Preprocessor.
For the normal preprocessor the preprocessed output goes directly to the 
diff-window.

When you specify a Line-Matching-Preprocessor then that output goes only to 
the diff algorithm. The real difference is then treated like white space 
differences.

> For CVS comments its 
> probably not important, but it might be nice to be
> able to specify a regexp to treat arbitrary text as
> whitespace. That's a rather more complex feature to
> ask for, though ;)

As in the specified example sed can do better than a simple regexp, because it 
can do a replacement and not only a simple match.

> Plus it would be nice if it could render binary files
> in hex rather than ascii, or even better in both
> formats simultaneously, as hex editors often do. I
> might try extending it this way myself if I can find
> some time.

Yes, a hex-display would be very nice.
The diff-algorithm would have to be a different one though. I think the 
algorithm from xdelta (http://sourceforge.net/projects/xdelta) would be best 
for big files.
If you're interested you might start by writing a standalone widget. If that 
works I'll integrate it in KDiff3.

Joachim

[Kdiff3-user] Re: Kdiff3-user digest, Vol 1 #19 - 1 msg

[<sea...@ya...>]

> As Michael already pointed out, this can be solved
> via a preprocessor:
> sed
>
"s/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/"

I use sed quite a bit to preprocess files before
diffing - the trouble is that you lose the difference
completely. It would be quite nice to be able to treat
it as a whitespace difference so it at least gets
highlighted for a quick check. For CVS comments its
probably not important, but it might be nice to be
able to specify a regexp to treat arbitrary text as
whitespace. That's a rather more complex feature to
ask for, though ;)

> See my previous answer here:
>
http://sourceforge.net/mailarchive/forum.php?thread_id=4078590&forum_id=38851

Cool, thanks!

> For the moment KDiff3 doesn't reject binary files as
> other tools do, but 
> during the diff and display KDiff3 substitutes some
> characters with spaces, 
> which means that it's not fully reliable for binary
> files.

Plus it would be nice if it could render binary files
in hex rather than ascii, or even better in both
formats simultaneously, as hex editors often do. I
might try extending it this way myself if I can find
some time.

Thanks to all who responded!

Bernie



	
	
		
___________________________________________________________
WIN FREE WORLDWIDE FLIGHTS - nominate a cafe in the Yahoo! Mail Internet Cafe Awards  www.yahoo.co.uk/internetcafes 

Re: [Kdiff3-user] Impressed - and some suggestions

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

Correction:
> sed "s/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/"

This sed-command might not work correctly under Unix-like systems because 
shell substitutions of '$' take precedence over the double quotation marks 
(").

Under Unix-like systems this can be avoided by using the single quotation 
marks (').
sed 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/'

But unfortunately this won't work on Windows.

Cheers,
Joachim

Re: [Kdiff3-user] Impressed - and some suggestions

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

Hi Bernie,

On Friday 02 April 2004 13:30, Bernie Ogden wrote:
> A very very nice tool. I've got two bugs:
> .....
> And a few future development suggestions:
> .....
Thanks for the detailed reports. I'll investigate ...

> An option to ignore CVS comments (e.g. $Revision: $)
> or to treat them as whitespace would be nice

As Michael already pointed out, this can be solved via a preprocessor:
Specify the following command as line-matching-preprocessor in the 
KDiff3-options.

sed "s/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/"

New to sed? Read more at
http://www.gnu.org/software/sed/manual/html_mono/sed.html#SEC7

(With all these user wishes I finally learn regular-expressions myself.)

If you are under Windows: A precompiled binary sed-version for Windows is 
available at http://unxutils.sourceforge.net
Unpack the zip-file and copy the tool from usr\local\wbin\sed.exe into your 
path. Otherwise you must specify the full path to the tool. Eg. if unpacked 
in C:
c:\usr\local\wbin\sed [options as shown above]


> CVS integration, as in tkdiff. Its really useful to be
> able to do a graphical CVS diff

See my previous answer here:
http://sourceforge.net/mailarchive/forum.php?thread_id=4078590&forum_id=38851

> Any chance of extending it to do binary diffs? If it
> could do those then I could be using one tool for all
> my diffing, which would be kinda nice.

For the moment KDiff3 doesn't reject binary files as other tools do, but 
during the diff and display KDiff3 substitutes some characters with spaces, 
which means that it's not fully reliable for binary files.
I agree, that it would be nice some future version perhaps.

Cheers,
Joachim

Re: [Kdiff3-user] Impressed - and some suggestions

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

Bernie Ogden wrote:

<snip>

> 
> And a few future development suggestions:
> 

<snip>

> 
> An option to ignore CVS comments (e.g. $Revision: $)
> or to treat them as whitespace would be nice
> 

I agree about the CVS comments stuff -- I use perforce which uses the 
same tags.  Granted, you could solve this through some sed/perl/awk 
preprocessing script.

-- 
Michael Denio (Mic...@mo...)
Equity Trading Infrastructure

[Kdiff3-user] Impressed - and some suggestions

[<sea...@ya...>]

A very very nice tool. I've got two bugs:

When doing a merge, the edit window sometimes seems to
jump beyond the next conflict when using Ctrl-Down.
I'm using the Windows version.

If a file is present in one directory but absent in
another and you select it for merging then things get
rather confusing. If you try to move on without saving
then it gets flagged as 'in progress' and doesn't
actually seem to get copied at the end as it would
have been if you left it untouched. Also, at least
some of the time it seems that you get a diff window,
with the file you selected on one side and the last
file in the other window on the other side.


And a few future development suggestions:

When doing a directory diff, if you attempt to select
a new file and the current one is not saved then you
are given the option to save and continue. If you
select this option but haven't resolved all your
conflicts then the new file is still highlighted in
the directory tree, which is a bit confusing. Also, if
you continue without saving then you lose all the
conflict resolution you've already done. It would be
nice if either you didn't lose it, or it was more
explicit about warning you that you will.

An option to ignore CVS comments (e.g. $Revision: $)
or to treat them as whitespace would be nice

CVS integration, as in tkdiff. Its really useful to be
able to do a graphical CVS diff

Any chance of extending it to do binary diffs? If it
could do those then I could be using one tool for all
my diffing, which would be kinda nice.

Regards,

Bernie


	
	
		
___________________________________________________________
WIN FREE WORLDWIDE FLIGHTS - nominate a cafe in the Yahoo! Mail Internet Cafe Awards  www.yahoo.co.uk/internetcafes 

[Kdiff3-user] Re: KDiff File Compare/Case Insensitivity

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

A precompiled binary sed-version for Windows is available at
http://unxutils.sourceforge.net
Unpack the zip-file and copy the tool from usr\local\wbin\sed.exe into your 
path. Otherwise you must specify the full path to the tool. Eg. if unpacked 
in C:
c:\usr\local\wbin\sed "s/\(.*\)/\U\1/"

Joachim

On Thursday 01 April 2004 18:01, Eliot Gorman wrote:
> Hi Joachim,
>
> Thanks for your quick reply.  I could not get the
> line-matching-preprocessor command to work - we are running on a windows
> platform and I suspect that is a unix command you specified?  I typed it in
> exactly as you had specified, but KDiff told me that it failed and would
> ignore it. Tried a few
> variations...
>
> Anyway, if that command is not available on the windows platform we will
> wait until you've added the case insensitivity feature.
>
> Best regards,
>
> Eliot
>
> -----Original Message-----
> From: Joachim Eibl [mailto:joa...@gm...]
> Sent: Thursday, April 01, 2004 10:24 AM
> To: eg...@in...
> Cc: kdi...@li...
> Subject: Re: KDiff File Compare/Case Insensitivity
>
>
> Hello Eliot,
>
> > KDiff is an excellent tool for Windows Source file compare & merge
> > activities.  One option that I was not able to find was the ability to
> > turn on/off Upper/Lower Case insensitivity.
> >
> > I have some instances where many case differences are found, but no
>
> others,
>
> > and we manually check those. On large directories, there can be hundreds
>
> of
>
> > case differences as a result of different developers individual IDE
> > settings.  I noticed the "Convert To Upper" option, but we did not want
> > to actually change the text to upper case, we simply want to ignore case
> > only differences during comparisons.
>
> You are right about the current status. I made this decision a long time
> ago but most of the reasons are obsolete now.
>
> It would probably be better to make an option to treat this kind of
> difference
> like whitespace-differences (just as another not so important difference).
>
> In fact you can achieve this by using the following command as
> line-matching-preprocessor command:
>
> sed "s/\(.*\)/\U\1/"
>
> By disabling "Show White Space" you also suppress these differences
> completely.
>
> Perhaps this helps until I've corrected this feature.
>
> Cheers,
> Joachim

Re: [Kdiff3-user] crashing problem

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

On Thursday 01 April 2004 17:53, Jack Coates wrote:
> yes, very reproducible with horizontal scrolling.
>
> [jack@jack jack]$ rpm -qa | grep qt
> libqt3-3.1.2-15.3.92mdk
> libqt3-devel-3.1.2-15.3.92mdk
> qt3-common-3.1.2-15.3.92mdk
>
...
> That video card is a little new for my taste, I suspect it.

I rather suspect qt-3.1.2. I had a similar problem once, which disappeared 
with a newer version of Qt (>3.2.x). I think it's best to upgrade that first. 
But inform me if it still persists after the upgrade.

Joachim

Re: [Kdiff3-user] crashing problem

[Jack C. <ja...@mo...>]

On Thu, 2004-04-01 at 07:30, Joachim Eibl wrote:
> On Thursday 01 April 2004 01:29, Jack Coates wrote:
> > I've been using kdiff3 on Mandrake 9.2 for about 6 months and I like it
> > a lot; however, it has a problem with locking up the XFree86 server
> > during horizontal scrolls. This is obviously annoying, especially trying
> > to do a code review with someone else.
> >
> > One potential wrinkle is that I'm using synergy 1.0.14 to share mouse
> > and keyboard to another Mandrake 9.2 box.
> >
> > Any ideas?
> 
> I don't think that it's related to the mouse or keyboard-sharing.
> What is your Qt-version? Perhaps you can upgrade your Qt-library and try 
> again.
> Can you reproduce the problem by doing the same things again? 
> 
> Cheers,
> Joachim

yes, very reproducible with horizontal scrolling.

[jack@jack jack]$ rpm -qa | grep qt
libqt3-3.1.2-15.3.92mdk
libqt3-devel-3.1.2-15.3.92mdk
qt3-common-3.1.2-15.3.92mdk

I've tried building kdiff3 from source and it still happens.

[jack@jack jack]$ lspcidrake 
unknown         : Intel Corporation|82845 845 (Brookdale) Chipset Host
Bridge [BRIDGE_HOST]
unknown         : Intel Corporation|82845 845 (Brookdale) Chipset AGP
Bridge [BRIDGE_PCI]
i810_rng        : Intel Corporation|82820 815e (Camino 2) Chipset PCI
[BRIDGE_PCI]
i810-tco        : Intel Corporation|82820 815e (Camino 2) Chipset ISA
Bridge (ICH2) [BRIDGE_ISA]
unknown         : Intel Corporation|82820 815e (Camino 2) Chipset IDE
U100 [STORAGE_IDE]
usb-uhci        : Intel Corporation|82820 815e (Camino 2) Chipset USB
(Hub A) [SERIAL_USB]
unknown         : Intel Corporation|82820 815e (Camino 2) Chipset SMBus
[SERIAL_SMBUS]
usb-uhci        : Intel Corporation|82820 815e (Camino 2) Chipset USB
(Hub B) [SERIAL_USB]
i810_audio      : Intel Corporation|ICH2 810 Chipset AC'97 Audio
Controller [MULTIMEDIA_AUDIO]
Card:NVIDIA GeForce4 (generic): nVidia Corporation|NV17 GeForce4 MX 440
[DISPLAY_VGA]
eepro100        : Intel Corp.|EtherExpress PRO/100B (TX)
[NETWORK_ETHERNET]
unknown         : Unknown|USB UHCI Root Hub [Hub|Root Hub]
unknown         : Unknown|USB UHCI Root Hub [Hub|Root Hub]
unknown         : Logitech Inc.|Optical Mouse [Human Interface
Devices|Boot Interface Subclass|Mouse]


That video card is a little new for my taste, I suspect it.
-- 
Jack at Monkeynoodle Dot Org: It's A Scientific Venture...
**********************************************************************
* "There was a shopping mall, now it's all covered with flowers,     *
* if this is Paradise I wish I had a lawnmower."                     *
* -- (Nothing But) Flowers from Sand in The Vaseline by The Talking  *
* Heads                                                              *
**********************************************************************

Re: [Kdiff3-user] crashing problem

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

On Thursday 01 April 2004 01:29, Jack Coates wrote:
> I've been using kdiff3 on Mandrake 9.2 for about 6 months and I like it
> a lot; however, it has a problem with locking up the XFree86 server
> during horizontal scrolls. This is obviously annoying, especially trying
> to do a code review with someone else.
>
> One potential wrinkle is that I'm using synergy 1.0.14 to share mouse
> and keyboard to another Mandrake 9.2 box.
>
> Any ideas?

I don't think that it's related to the mouse or keyboard-sharing.
What is your Qt-version? Perhaps you can upgrade your Qt-library and try 
again.
Can you reproduce the problem by doing the same things again? 

Cheers,
Joachim

[Kdiff3-user] Re: KDiff File Compare/Case Insensitivity

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

Hello Eliot,

> KDiff is an excellent tool for Windows Source file compare & merge
> activities.  One option that I was not able to find was the ability to
> turn on/off Upper/Lower Case insensitivity.
>
> I have some instances where many case differences are found, but no others,
> and we manually check those. On large directories, there can be hundreds of
> case differences as a result of different developers individual IDE
> settings.  I noticed the "Convert To Upper" option, but we did not want to
> actually change the text to upper case, we simply want to ignore case only
> differences during comparisons.

You are right about the current status. I made this decision a long time ago 
but most of the reasons are obsolete now. 

It would probably be better to make an option to treat this kind of difference 
like whitespace-differences (just as another not so important difference).

In fact you can achieve this by using the following command as 
line-matching-preprocessor command:

sed "s/\(.*\)/\U\1/"

By disabling "Show White Space" you also suppress these differences 
completely.

Perhaps this helps until I've corrected this feature.

Cheers,
Joachim