kdiff3-user — User questions about KDiff3.

[Kdiff3-user] kdiff3 bugs and comments

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

Version: 0.9.86 3.4.0 Level "b" , SUSE 9.3
OS: Linux (i686) release 2.6.11.4-20a-default
Compiler: gcc version 3.3.5 20050117 (prerelease) (SUSE Linux)

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).

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.

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. 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.

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).

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.

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.

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.

William

Re: [Kdiff3-user] KDiff3: Characters within the line

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

On Tuesday 22 March 2005 12:07, Stephen Darnell wrote:
> I just thought I'd note a potential improvement to the diff results of
> KDiff3. The change I was looking at was (moving a var declaration into a
> for):
>
> - int i;
> - for(i = 0; i < xxx; i++) {
> + for(int i = 0; i < xxx; i++) {
>
> But the way this ends up being highlighted is that the
> line that has been modified is the "int i;" rather than
> the "for(...){" and the new 'for' line is aligned with the
> old 'int' line. (I have the 'try harder' option enabled)
>
> Presumably KDiff3 does a line by line diff, and then a
> simple character by character diff of the differing region?
>
> findDiff() does seem to calculate the diff of a particular
> line, but I assume one would need to tweak the line
> matching algorithm to better relate differing lines?

Yes, I would also like that. I just haven't found the time to do this yet.
Joachim

Re: [Kdiff3-user] KDiff3 - Invoking an editor/tool

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

On Monday 21 March 2005 23:31, Stephen Darnell wrote:
> KDiff3 is obviously great, but...
>
> One feature that I'm used to with other tools is the ability
> to right-click on a given line (in any of the document windows)
> to pull up a menu, and from there, invoke an external editor
> with at that line number.
>
> When the external editor process exits, it would make sense to
> check the file modification times, and refresh automatically.
>
> Unfortunately how you invoke an external editor at a given line
> number varies, so some form of variable expansion is probably needed,
> e.g.:
>       External editor: myeditor -line $line $file

Interesting idea. Shouldn't be too difficult either.
In the meanwhile you could try to merge files and use the integrated merge 
editor.

Cheers,
Joachim

Re: [Kdiff3-user] Full Analysis speed using reg xp's on Windows

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

On Monday 21 March 2005 22:41, Bob Eby wrote:
> I just downloaded and started using KDiff3 a couple days ago.  It seems
> to work great for letting me diff large volumes of CVS files, avoiding
> differences in the comments, and differences in "lint" that I don't
> really care about.  However, using cygwin's version of sed and the line
> by line preprocessor is rather slow and invasive because 2 new command
> windows are opened for each pair of diff'ed files.  I'm just wondering
> if there's a better/faster way to do regular expression matching using
> the pre-processor on Windows (2000 and 2003 server in this case).
> Perhaps a native version of sed or a different tool entirely?  (It's
> taking me 1.5 hours to process 2500 files...  pretty dismal)

For the moment you might try the sed that comes with the package from 
unxutils.sourceforge.net. This doesn't depend on cygwin and might be faster. 
But I admit that for so huge comparisons it would be best to do a built-in 
regexp-analysis, because this would avoid the creation of temporary files 
alltogether. Perhaps you could create a RAM-disk for your temporary files and 
sed.exe.

> I'm also wishing I could do a directory merge that lets me have file by
> file control without forcing me to go in alphabetical order, but I'm
> still learning what is and isn't possible here, so I'll ask more about
> that later.

Try menu "Directory"->"Run Operation for Current Item" (F6).

Cheers,
Joachim

[Kdiff3-user] KDiff3: Characters within the line

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

I just thought I'd note a potential improvement to the diff results of KDiff3.
The change I was looking at was (moving a var declaration into a for):

- int i;
- for(i = 0; i < xxx; i++) {
+ for(int i = 0; i < xxx; i++) {

But the way this ends up being highlighted is that the
line that has been modified is the "int i;" rather than
the "for(...){" and the new 'for' line is aligned with the
old 'int' line. (I have the 'try harder' option enabled)

Presumably KDiff3 does a line by line diff, and then a
simple character by character diff of the differing region?

findDiff() does seem to calculate the diff of a particular
line, but I assume one would need to tweak the line
matching algorithm to better relate differing lines?

Regards,
  Stephen




 

[Kdiff3-user] KDiff3 - Invoking an editor/tool

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

KDiff3 is obviously great, but...

One feature that I'm used to with other tools is the ability
to right-click on a given line (in any of the document windows)
to pull up a menu, and from there, invoke an external editor
with at that line number.

When the external editor process exits, it would make sense to
check the file modification times, and refresh automatically.

Unfortunately how you invoke an external editor at a given line
number varies, so some form of variable expansion is probably needed,
e.g.:
      External editor: myeditor -line $line $file

Regards,
  Stephen

[Kdiff3-user] Full Analysis speed using reg xp's on Windows

[Bob E. <be...@le...>]

Hi,

=20

I just downloaded and started using KDiff3 a couple days ago.  It seems
to work great for letting me diff large volumes of CVS files, avoiding
differences in the comments, and differences in "lint" that I don't
really care about.  However, using cygwin's version of sed and the line
by line preprocessor is rather slow and invasive because 2 new command
windows are opened for each pair of diff'ed files.  I'm just wondering
if there's a better/faster way to do regular expression matching using
the pre-processor on Windows (2000 and 2003 server in this case).
Perhaps a native version of sed or a different tool entirely?  (It's
taking me 1.5 hours to process 2500 files...  pretty dismal)

=20

I'm also wishing I could do a directory merge that lets me have file by
file control without forcing me to go in alphabetical order, but I'm
still learning what is and isn't possible here, so I'll ask more about
that later. =20

=20

Thanx for any suggestions,

-Bob

Re: [Kdiff3-user] KDiff3 0.9.88 Building (and Working!) on Mac OSX 10.3.8

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

On Saturday 05 March 2005 15:22, Mark Teel wrote:
> I just joined the user list but have been using Kdiff3 on linux, FreeBSD
> and windows for some time. Really nice app, thanks for the hard work.

Cool. Now with Mac this makes four different platforms. Can anybody top that?

> I just recently broke down and bought a Mac (love it!). Unfortunately,
> I could not get Kdiff3 to build after I installed Qt/Mac. But, after
> some hacking on a system header, it builds and works (somewhat). The
> main problem is that the main window has no resize handle in the bottom
> right corner, as is the OS X standard. So it is either very small or
> full screen :(  Otherwise, it seems to be working pretty well.
>
> So my questions are:
>
> 1) Has anyone found a better way to build for Mac OSX 10.3.8?
Somebody with a Mac has to answer this.

> 2) Would anyone be interested in my procedure to get it built?
Yes, of course. I would add the instructions to the README.

> 3) Could the developers address the inability to resize the main window?
Please change line 289-290 in kdiff3.cpp (KDiff3-0.9.88) like this:
   if (statusBar() !=0 )
       statusBar()->setSizeGripEnabled(true);

If you've linked KDiff3 with Qt-libs statically, could you please send me the 
binary. I would upload it for other Mac users.

Cheers,
Joachim

[Kdiff3-user] KDiff3 0.9.88 Building (and Working!) on Mac OSX 10.3.8

[Mark T. <ma...@te...>]

Hello:

I just joined the user list but have been using Kdiff3 on linux, FreeBSD
and windows for some time. Really nice app, thanks for the hard work.

I just recently broke down and bought a Mac (love it!). Unfortunately,
I could not get Kdiff3 to build after I installed Qt/Mac. But, after
some hacking on a system header, it builds and works (somewhat). The
main problem is that the main window has no resize handle in the bottom
right corner, as is the OS X standard. So it is either very small or
full screen :(  Otherwise, it seems to be working pretty well.

So my questions are:

1) Has anyone found a better way to build for Mac OSX 10.3.8?
2) Would anyone be interested in my procedure to get it built?
3) Could the developers address the inability to resize the main window?

Hope this isn't a redundant or old topic.

MST

[Kdiff3-user] New KDiff3 version 0.9.88

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

Hi KDiff3-Users,

Version 0.9.88 - 2005/25/02
===========================
- Fixed crash that occurred in Directory Comparison mode "Full-Analysis".
- Fix for Windows: Didn't save encoding correctly.
- Many translations updated.

Cheers,
Joachim

Re: [Kdiff3-user] says manual merge but text is identical

[Matt W. <ma...@gm...>]

> If you prefer to recognize equal texts by the coloring please use the
> directory option "Full Analysis" and (new in 0.9.87) "White space differences
> considered equal".

That did the trick, thanks!

-- 
-matt

Re: [Kdiff3-user] Problem diffing two directories

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

On Friday 18 February 2005 01:46, Craig Boland wrote:
> I'm having trouble diffing two directories. This is
> the command I'm using:
>
> kdiff3 dir1 dir2 -o diff.txt --auto
>
> My problem is that the GUI always appears. The result
> displayed in the GUI is correct, though I can see 'Not
> available' in the Type column of the right-hand pane
> for 'Dest'. The output file (diff.txt) is never
> created. I've tried other combinations of switches,
> even setting the output (-o) to an existing directory,
> but the result is always the same. Doesn't --auto
> suppress the GUI? And why is diff.txt never created?
>
> What am I doing wrong?

Hi,

Currently the "--auto"-option is only intended for automatical file merge 
operation, but has no effect for directories.

It would only work if you specify three input files (the first being the 
base). Otherwise the algorithm can't distinguish between solvable and 
unsolvable conflicts.

Example:
kdiff3 base.txt branch1.txt branch2.txt -o mergeresult.txt --auto

I will improve the help info in that respect.

But could you perhaps specify what kind of problem you want to solve? Perhaps 
it is solvable by some other way or with a future feature.

Cheers,
Joachim

[Kdiff3-user] says manual merge but text is identical

[Matt W. <ma...@gm...>]

Hi, I'm new to kdiff3 so if this is a silly question, please bear with me!

I'm comparing two directories and kdiff3 always sets the operation for
the files to "Merge (manual)", however when I 2x-click on any of the
files I get a dialog box which says "Files A and B have equal text."

What's going on?

I'm using v0.9.87 on Windows XP.

thanks,

-- 
-matt

[Kdiff3-user] Problem diffing two directories

[Craig B. <cnb...@sb...>]

I'm having trouble diffing two directories. This is
the command I'm using:

kdiff3 dir1 dir2 -o diff.txt --auto

My problem is that the GUI always appears. The result
displayed in the GUI is correct, though I can see 'Not
available' in the Type column of the right-hand pane
for 'Dest'. The output file (diff.txt) is never
created. I've tried other combinations of switches,
even setting the output (-o) to an existing directory,
but the result is always the same. Doesn't --auto
suppress the GUI? And why is diff.txt never created?

What am I doing wrong?

[Kdiff3-user] KDiff3-0.9.87 with Unicode-support is available

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

Hi everybody,

Finally a new version of KDiff3 is there for you.
Version 0.9.87 features one big improvement: Unicode and UTF-8-support

This was requested so often, but much more effort than you would probably 
expect. But now you can adjust the options so that you can even merge files 
that are saved in different encodings. If you need special characters just 
use a font that contains these.

Have fun,
Joachim

Re: [Kdiff3-user] Feature request

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

On Tuesday 25 January 2005 13:31, Mark Frank wrote:
> Hi!
>
> First, thank'you to Joachim for kdiff3! Your tool is fantastic!
> A feature that i often need: an additional "operation" in dir comparison
> based on the size of the "same-name" files!
> For example an item in the "directory" menu called "Select bigger for
> all" o "Select smallest for all".
>
> What do you think about this? Can be quickly done with the current
> release? Currenty I go to manually select the operation of every files!
> It takes so long! :(

Thanks for writing. I'm receiving several similar requests lately, but what 
should be chosen automatically varies. So I'll consider how to satisfy you 
and other users best. This probably will not make it into the next release 
though.

Cheers,
Joachim

[Kdiff3-user] Feature request

[Mark F. <pl...@fr...>]

Hi!

First, thank'you to Joachim for kdiff3! Your tool is fantastic!
A feature that i often need: an additional "operation" in dir comparison 
based on the size of the "same-name" files!
For example an item in the "directory" menu called "Select bigger for 
all" o "Select smallest for all".

What do you think about this? Can be quickly done with the current 
release? Currenty I go to manually select the operation of every files! 
It takes so long! :(

Thank'you!

bye

Re: [Kdiff3-user] Optional auto ignore file when newer -o destination ?

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

Hi J=C3=B8rgen,

On Monday 24 January 2005 12:33, J=C3=B8rgen Hermanrud Fjeld wrote:
> Hi,
> when I restart kdiff3 the state for a directory merge is lost,
> to remedy this, is there an option to auto select ignore when the
> destination file is newer than all the sources?
> With such an option I could continue with directory merging later,
> and the output files that where already merged are unaffected, and I
> don't have to select Ignore manually.
>
> Thank you for great work on kdiff3!

I'm not sure that the option you propose would really help you, because how=
=20
can you be sure that for every file you want to merge the destination is no=
t=20
the newest right from the start?
This would work only if you knew exactly that nobody touched a file in that=
=20
directory. But this would also require some effort. Probably it would be=20
cleanest, to allow to save the directory merge state in a file that the use=
r=20
can specify.

If you agree, then I'll put this on my todo-list.

Cheers,
Joachim

[Kdiff3-user] Optional auto ignore file when newer -o destination ?

[H. F. <jh...@he...>]

Hi,
when I restart kdiff3 the state for a directory merge is lost,=20
to remedy this, is there an option to auto select ignore when the
destination file is newer than all the sources?
With such an option I could continue with directory merging later,
and the output files that where already merged are unaffected, and I
don't have to select Ignore manually.

Thank you for great work on kdiff3!

--=20
Sincerely | Homepage:
J=F8rgen    | http://www.hex.no/jhf
          | Public GPG key:
          | http://www.hex.no/jhf/key.txt

Re: [Kdiff3-user] Solaris compile error using Qt 3.3.3

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

 
Changing as below fixed the compile errors with gcc
2.95.   I also modified the kdiff3.pro slightly to do
a static compile (see below)

Thank you.
Phil

// 2. If the files don't have the same name then show
all names
if ( caption.isEmpty() && (!f1.isEmpty() ||
!f2.isEmpty() || !f3.isEmpty()) )
{
caption = ( f1.isEmpty()? QString("") :
QString(".../")+f1 );
caption += QString(caption.isEmpty() || f2.isEmpty() ?
QString("") : QString(" <-> ")) + ( f2.isEmpty()?
QString("") : QString(".../")+f2 );
caption += QString(caption.isEmpty() || f3.isEmpty() ?
QString("") : QString(" <-> ")) + ( f3.isEmpty()?
QString("") : QString(".../")+f3 ) ;
}

m_pKDiff3Shell->setCaption( caption.isEmpty() ?
QString("KDiff3") : caption+QString(" - KDiff3"));
}

-------------kdiff3.pro---------------

TEMPLATE = app
LINK += Bstatic
LIBS += -lICE -lSM -lstdc++ -L/usr/openwin/lib
-L/usr/local/lib
CONFIG  += qt warn_on thread release create_prl
link_prl
HEADERS  = version.h diff.h kdiff3.h merger.h
optiondialog.h kreplacements/kreplacements.h \
directorymergewindow.h fileaccess.h kdiff3_shell.h
kdiff3_part.h
SOURCES  = diff.cpp difftextwindow.cpp kdiff3.cpp
main.cpp merger.cpp mergeresultwindow.cpp \
optiondialog.cpp pdiff.cpp directorymergewindow.cpp
fileaccess.cpp \
kdiff3_shell.cpp kdiff3_part.cpp
kreplacements/kreplacements.cpp \
gnudiff_analyze.cpp gnudiff_io.cpp gnudiff_xmalloc.cpp
TARGET   = kdiff3
INCLUDEPATH += . ./kreplacements

unix {
documentation.path = /usr/local/share/doc/kdiff3
documentation.files = ../doc/*

INSTALLS += documentation

target.path = /usr/local/bin
INSTALLS += target
}


__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com 

Re: [Kdiff3-user] Solaris compile error using Qt 3.3.3

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

Hi Phil,

Your problem is compiler-specific: (gcc<=2.96?)

Change lines 465-467 like this:
 caption = ( f1.isEmpty()? QString("") : ".../"+f1 );
 caption += QString(caption.isEmpty() || f2.isEmpty() ? QString("") : " <-> ") 
+ ( f2.isEmpty()? QString("") : ".../"+f2 );
 caption += QString(caption.isEmpty() || f3.isEmpty() ? QString("") : " <-> ") 
+ ( f3.isEmpty()? QString("") : ".../"+f3 ) ;

If any similar errors occur: Cast the char-string to a QString as was done 
above.

Cheers,
Joachim


On Wednesday 12 January 2005 01:37, Robert Orr wrote:
> Hi Joachim,
>
> Getting a little compile error using qt-3.3.3
> Maybe I should try Qt 3.1???
>
> Maybe you already know what it is with 3.3.3 that is
> causing the problem in pdiff.cpp?
>
> Phil
>
> make -f Makefile.qt
> g++ -c -Wall -W -O2 -D_REENTRANT  -DQT_NO_DEBUG
> -DQT_THREAD_SUPPORT
> -DQT_SHARED
> -I/export/users/reyes/temp/mntnaz7/Qt/qt-x11-free-3.3.3/mkspecs/default
> -I. -I. -Ikreplacements
> -I/u/reyes/temp/mntnaz7/Qt/Qt_mt_Dyn/include -o
> pdiff.o pdiff.cpp
> pdiff.cpp: In method `void KDiff3App::init(bool =
> false,
> TotalDiffStatus * = 0)':
> pdiff.cpp:465: ambiguous overload for `bool ? const
> char[1] : const
> QString'
> pdiff.cpp:465: candidates are: operator ?:(bool,
> QString, QString)
> <builtin>
> pdiff.cpp:465:                 operator ?:(bool,
> basic_string<char,string_char_traits<char>,__default_alloc_template<false,0
>>
>
> >, string)
>
> <builtin>
> pdiff.cpp:465:                 operator ?:(bool, const
> char *, const
> char *) <builtin>
> pdiff.cpp:466: ambiguous overload for `bool ? const
> char[1] : const
> QString'
> pdiff.cpp:466: candidates are: operator ?:(bool,
> QString, QString)
> <builtin>
> pdiff.cpp:466:                 operator ?:(bool,
> basic_string<char,string_char_traits<char>,__default_alloc_template<false,0
>>
>
> >, string)
>
> <builtin>
> pdiff.cpp:466:                 operator ?:(bool, const
> char *, const
> char *) <builtin>
> pdiff.cpp:467: ambiguous overload for `bool ? const
> char[1] : const
> QString'
> pdiff.cpp:467: candidates are: operator ?:(bool,
> QString, QString)
> <builtin>
> pdiff.cpp:467:                 operator ?:(bool,
> basic_string<char,string_char_traits<char>,__default_alloc_template<false,0
>>
>
> >, string)
>
> <builtin>
> pdiff.cpp:467:                 operator ?:(bool, const
> char *, const
> char *) <builtin>
> pdiff.cpp:470: ambiguous overload for `bool ? const
> char[7] : const
> QString'
> pdiff.cpp:470: candidates are: operator ?:(bool,
> QString, QString)
> <builtin>
> pdiff.cpp:470:                 operator ?:(bool,
> basic_string<char,string_char_traits<char>,__default_alloc_template<false,0
>>
>
> >, string)
>
> <builtin>
> pdiff.cpp:470:                 operator ?:(bool, const
> char *, const
> char *) <builtin>
> pdiff.cpp: In function `void
> mergeChooseGlobal(KDiff3App *,
> MergeResultWindow *, int, bool, bool)':
> pdiff.cpp:1444: warning: unused parameter `class
> KDiff3App * pThis'
> make: *** [pdiff.o] Error 1
>
>
>
>
> __________________________________________________
> Do You Yahoo!?
> Tired of spam?  Yahoo! Mail has the best spam protection around
> http://mail.yahoo.com
>
>
> -------------------------------------------------------
> The SF.Net email is sponsored by: Beat the post-holiday blues
> Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
> It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] Solaris compile error using Qt 3.3.3

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

Hi Joachim,

Getting a little compile error using qt-3.3.3
Maybe I should try Qt 3.1???   

Maybe you already know what it is with 3.3.3 that is
causing the problem in pdiff.cpp?  
 
Phil

make -f Makefile.qt 
g++ -c -Wall -W -O2 -D_REENTRANT  -DQT_NO_DEBUG
-DQT_THREAD_SUPPORT 
-DQT_SHARED 
-I/export/users/reyes/temp/mntnaz7/Qt/qt-x11-free-3.3.3/mkspecs/default
-I. -I. -Ikreplacements 
-I/u/reyes/temp/mntnaz7/Qt/Qt_mt_Dyn/include -o
pdiff.o pdiff.cpp
pdiff.cpp: In method `void KDiff3App::init(bool =
false, 
TotalDiffStatus * = 0)':
pdiff.cpp:465: ambiguous overload for `bool ? const
char[1] : const 
QString'
pdiff.cpp:465: candidates are: operator ?:(bool,
QString, QString) 
<builtin>
pdiff.cpp:465:                 operator ?:(bool, 
basic_string<char,string_char_traits<char>,__default_alloc_template<false,0>
>, string) 
<builtin>
pdiff.cpp:465:                 operator ?:(bool, const
char *, const 
char *) <builtin>
pdiff.cpp:466: ambiguous overload for `bool ? const
char[1] : const 
QString'
pdiff.cpp:466: candidates are: operator ?:(bool,
QString, QString) 
<builtin>
pdiff.cpp:466:                 operator ?:(bool, 
basic_string<char,string_char_traits<char>,__default_alloc_template<false,0>
>, string) 
<builtin>
pdiff.cpp:466:                 operator ?:(bool, const
char *, const 
char *) <builtin>
pdiff.cpp:467: ambiguous overload for `bool ? const
char[1] : const 
QString'
pdiff.cpp:467: candidates are: operator ?:(bool,
QString, QString) 
<builtin>
pdiff.cpp:467:                 operator ?:(bool, 
basic_string<char,string_char_traits<char>,__default_alloc_template<false,0>
>, string) 
<builtin>
pdiff.cpp:467:                 operator ?:(bool, const
char *, const 
char *) <builtin>
pdiff.cpp:470: ambiguous overload for `bool ? const
char[7] : const 
QString'
pdiff.cpp:470: candidates are: operator ?:(bool,
QString, QString) 
<builtin>
pdiff.cpp:470:                 operator ?:(bool, 
basic_string<char,string_char_traits<char>,__default_alloc_template<false,0>
>, string) 
<builtin>
pdiff.cpp:470:                 operator ?:(bool, const
char *, const 
char *) <builtin>
pdiff.cpp: In function `void
mergeChooseGlobal(KDiff3App *, 
MergeResultWindow *, int, bool, bool)':
pdiff.cpp:1444: warning: unused parameter `class
KDiff3App * pThis'
make: *** [pdiff.o] Error 1
 
 


__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com 

Re: [Kdiff3-user] Solaris configure error....checking for kde.... configure: error:

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

Hi Phil,

You don't need KDE, but then don't use configure, but enter the src-dir and 
compile via "make -f Makefile.qt". Read the README for more information about 
this.

Cheers,
Joachim


On Monday 10 January 2005 21:08, Robert Orr wrote:
> Has anyone compiled for Solaris 5.7?
>
> I am getting this error about KDE and I wonder if I
> need to have KDE to configure kdiff3 on Solaris.
>
> The error says....
>
> checking for kde.... configure: error:
> in the prefix, you've chosen, are no KDE headers
> installed.   This will fail.  So, check this please
> and use another prefix.
>
> I'm using a simple ./configure with no options.
>
> thanks for any feedback.
> Phil
>
>
>
>
> __________________________________
> Do you Yahoo!?
> The all-new My Yahoo! - What will yours do?
> http://my.yahoo.com
>
>
> -------------------------------------------------------
> The SF.Net email is sponsored by: Beat the post-holiday blues
> Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
> It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] Solaris configure error....checking for kde.... configure: error:

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

Has anyone compiled for Solaris 5.7?    

I am getting this error about KDE and I wonder if I
need to have KDE to configure kdiff3 on Solaris.  

The error says....

checking for kde.... configure: error:
in the prefix, you've chosen, are no KDE headers
installed.   This will fail.  So, check this please
and use another prefix.    

I'm using a simple ./configure with no options.

thanks for any feedback.
Phil



		
__________________________________ 
Do you Yahoo!? 
The all-new My Yahoo! - What will yours do?
http://my.yahoo.com 

Re: [Kdiff3-user] feature request to keep parallel adds

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

Hi Florian,

On Friday 07 January 2005 17:50, Florian Specker wrote:
> hi all,
>
> first of all, i'd like to thank you for this great app! i use it at work
> to resolve conflicts when working with subversion, and k3diff helps a
> lot. keep up the good work!
Thanks.

> occasionally, i have conflicting changes where i'd like to keep both.
> e.g. i've added a new statement in line 14, and someone else added a
> different new statement at line 14 at the same time. when merging, i'd
> like to keep both lines. in the context menu of a <Merge Conflict>, i
> can only choose "Select Line(s) from A" or "Select Line(s) from B", but
> i'd like to "Keep Line(s) from A before B" or "Keep Line(s) from B
> before A".

This should already work by selecting all wanted sources in the order you want 
them. e.g. If you want the lines from B first, press B first and then A. 
Toggling these buttons again will remove the respective lines.

> additionally, if the conflicting add operations span over several lines,
> this choice should be possible on a per-line basis (instead of a
> per-conflict basis).
>
> afaik, tortoise merge offers such functionality; it would be nice to
> have it available in kdiff3 as well :-)

Yes, it's on my todo-list, but for now you can help yourself by editing the 
result. e.g. Select A and B and then use cut and paste to move the lines to 
the correct places.

Cheers,
Joachim