kdiff3-user — User questions about KDiff3.

[Kdiff3-user] Copy/past from clipboard troncated

[Fontaine P. <kei...@ya...>]

Hello, =0A=0AI have a problem copy/past them.=0ACopies since the clipboard =
is truncated.=0A=0ACan you solve this problem in your future version of thi=
s product, brilliant???=0A=0AThank you for your job.=0A=0A=0A=0A=0A=0A=0A=
=0A      __________________________________________________________________=
___________ =0ANe gardez plus qu'une seule adresse mail ! Copiez vos mails =
vers Yahoo! Mail 

Re: [Kdiff3-user] access to http://...

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

> You added (yet) ... so there's hope one day that Windows users can get it
> too?

I hope that KDE4 will work for Windows too and KIO-support comes with that.

> In the meanwhile, let's see how to DIY (Do-it-yourself) for Windows. In the
> source package README, to build the QT only version, VC6 VC7 was mentioned.
> As I have used them before, I would appreciate any additional explicit
> hints/instructions, make files, etc.

Try to build KDiff3 version based on Qt4: Because an open source edition of 
Qt4 is available for Windows.
Follow the instructions in the README for "Building KDiff3 with Qt4".
You'll need the GNU-Compilers for Windows (MinGW), because Trolltech supports 
the VC-compilers only for the commercial Qt-version (for which you probably 
don't have a license).

Cheers,
Joachim

Re: [Kdiff3-user] access to http://...

[YC C. <pet...@gm...>]

Dear Joachim,
Sorry for the delay in replying, I was looking for a way to reply in the
Email Archive which is (always) read only.

>KIO-slaves are KDE specific. This should work under KDE and Linux (or other
unix), but currently not on Windows (yet).

You added (yet) ... so there's hope one day that Windows users can get it
too?

In the meanwhile, let's see how to DIY (Do-it-yourself) for Windows. In the
source package README, to build the QT only version, VC6 VC7 was mentioned.
As I have used them before, I would appreciate any additional explicit
hints/instructions, make files, etc.

Thanks!

[Kdiff3-user] Feature Request

[Thomas M. <tho...@we...>]

Hello,

i searched for the following feature. I have a 3 way directory diff. A, B and C is there any possibility to switch for example A with C 
on a fast way. For example a context menu or a shortcut. If there isn`t any possibility would it be possible to implement this.

If I open three directories for a diff with the diff-ext there is no possibility to say wich directory for example is the base.

Thanks and cu
Thomas
_____________________________________________________________________
Der WEB.DE SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen!
http://smartsurfer.web.de/?mc=100071&distributionid=000000000066

Re: [Kdiff3-user] access to http://...

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

Hi,

KIO-slaves are KDE specific. This should work under KDE and Linux (or other 
unix), but currently not on Windows (yet).

Cheers,
Joachim


Am Dienstag, 21. August 2007 15:25 schrieb YC Chan:
> Hi,
> I've been pouring over KDIFF3 since a few days now. It's a fantastic tool!
> My version is kdiff3-0.9.92, and I use kdiff3.exe on Windows.
> Another miracle is that there is no installation and kdiff3.exe runs!
> The doc says there are potential problems on KIO slaves...
>
> Indeed, I would like to access an url with http://etc. However both
> kdiff3.exe and
> kdiff3-qt4.exe appends the current directory in front of http:/etc.
> (removed /) and
> reports that the file/dir cannot be found.
>
> Typing http://etc. in my browser did get the file I wanted to compare.
> In particular, the url is http://localhost/application/data/file.txt. I
> plan to go live soon.
>
> Is this normal? I did not install anything (KIO slaves ?) on Windows.
> Is there a way out?
>
> Thanks!

[Kdiff3-user] access to http://...

[YC C. <pet...@gm...>]

Hi,
I've been pouring over KDIFF3 since a few days now. It's a fantastic tool!
My version is kdiff3-0.9.92, and I use kdiff3.exe on Windows.
Another miracle is that there is no installation and kdiff3.exe runs!
The doc says there are potential problems on KIO slaves...

Indeed, I would like to access an url with http://etc. However both
kdiff3.exe and
kdiff3-qt4.exe appends the current directory in front of http:/etc. (removed
/) and
reports that the file/dir cannot be found.

Typing http://etc. in my browser did get the file I wanted to compare.
In particular, the url is http://localhost/application/data/file.txt. I plan
to go live soon.

Is this normal? I did not install anything (KIO slaves ?) on Windows.
Is there a way out?

Thanks!

[Kdiff3-user] feature suggestion - quick close if files are identical

[Yossi Z. <yos...@gm...>]

I suggest to add an option for 'open viewer automatically only if files
don't match'. If you enable it, then when comparing two identical files, you
just get a 'No difference found' message box and dismiss it (similar to
ClearCase built-in comparison tool). Currently in KDiff3, you also get such
a message, but also need to close the main Windows. A bit annoying, IMHO.

YossiZ

[Kdiff3-user] list instead of tree

[Bela B. <te...@gm...>]

Hi,
I really like kdiff3.
What would be cool: Use listview instead of treeview for directories.
The tree is fancy, but a simple list is more productive.

Cheers,
-- 
teki

Re: [Kdiff3-user] any plan for a meaningful exit code ?

[WYSOCKI Jean-E. <jea...@eu...>]

Hi Joachim,

suppress ? what do you mean ?...

I was rather thinking of having the exit code set to 0 every time - and
ONLY when, the merge DOES complete - whatever the mode/context : folder
merge, file merge, both.

Cause it makes sense when merging folders too, to know whether any files
that required to be merged actually were (and saved) when exiting
kdiff3. And if no files required to be merged but just folders, then the
exit code should be set to 0 if the (folder) merge completed.

Otherwise stated : exit code should be set to 0 when the last key press
on F7 pops up the dialog box 'Merge Operation complete'. And eventually
later changed accordingly to any additional action the user might
perform after having acknowledged it (pressed the 'OK' button) instead
of exiting the application right away.

Cheers,
Jean-Eric

-----Original Message-----
From: kdi...@li...
[mailto:kdi...@li...] On Behalf Of Joachim
Eibl
Sent: 10 July 2007 23:00
To: kdi...@li...
Subject: Re: [Kdiff3-user] any plan for a meaningful exit code ?

Hi Jean-Eric,

KDiff3 exits with 1 when the last file-merge was not completed and
nothing was=20
saved.

You are right that this doesn't make much sense for a folder merge, but
it is=20
important for a file merge, so the calling program will know what
happened.

I can suppress this error code when in directory merge mode.

Cheers,
Joachim

Am Dienstag, 10. Juli 2007 08:53 schrieb WYSOCKI Jean-Eric:
> when used for 3 way folder merging, kdiff3 exits with a non null code
in
> contexts (for instance - did not test all cases...) where only folder
> merge (no file merge) is required - whatever the merge actually
> completed or not.
> wouldn't it be nice if exit code was equal to 0 anytime the merge
> completed ?

------------------------------------------------------------------------
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Kdiff3-user mailing list
Kdi...@li...
https://lists.sourceforge.net/lists/listinfo/kdiff3-user

Re: [Kdiff3-user] any plan for a meaningful exit code ?

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

Hi Jean-Eric,

KDiff3 exits with 1 when the last file-merge was not completed and nothing was 
saved.

You are right that this doesn't make much sense for a folder merge, but it is 
important for a file merge, so the calling program will know what happened.

I can suppress this error code when in directory merge mode.

Cheers,
Joachim

Am Dienstag, 10. Juli 2007 08:53 schrieb WYSOCKI Jean-Eric:
> when used for 3 way folder merging, kdiff3 exits with a non null code in
> contexts (for instance - did not test all cases...) where only folder
> merge (no file merge) is required - whatever the merge actually
> completed or not.
> wouldn't it be nice if exit code was equal to 0 anytime the merge
> completed ?

[Kdiff3-user] any plan for a meaningful exit code ?

[WYSOCKI Jean-E. <jea...@eu...>]

when used for 3 way folder merging, kdiff3 exits with a non null code in
contexts (for instance - did not test all cases...) where only folder
merge (no file merge) is required - whatever the merge actually
completed or not.
wouldn't it be nice if exit code was equal to 0 anytime the merge
completed ?
=20
=20

Re: [Kdiff3-user] '-u' option not supported (and needed by svn diff)

[<fre...@eo...>]

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
  <meta content="text/html;charset=UTF-8" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
Hi Joachim,<br>
<br>
You're right, the '-u' is correctly ignored...<br>
Is it a recent modification ? As I used a Fedora Core 6 package some
weeks ago, maybe it was an old version without the change.<br>
Very strange, as I clearly saw the error message... But, today, with
the official Fedora Core 6 package on another PC, it works.<br>
<br>
So, thank you for this powerful tool !<br>
<br>
Regards,<br>
Frédéric<br>
<br>
Joachim Eibl a écrit :
<blockquote cite="mid:200...@gm..."
 type="cite">
  <pre wrap="">Am Dienstag, 3. Juli 2007 11:11 schrieb Frédéric COIFFIER:
  </pre>
  <blockquote type="cite">
    <pre wrap="">Hi,

If kdiff3 is used with Subversion (as default diff-tool), the -u option
seems to be mandatory with Subversion 1.4.3.
This dirty patch can workaround the problem, in main.cpp :

{ "config file", I18N_NOOP("Use a different config file."), 0 },
+ { "u", 0, 0 }
};
    </pre>
  </blockquote>
  <pre wrap=""><!---->
Hi Frédéric,

KDiff3 should already support adding "Ignorable Commandline options" via the 
option in the integration settings. The default value 
contains "-u;-query;-html;-abort". So -u should already be ignored.

Doesn't that work correctly? What version do you use number? 
(Windows/Unix/KDE)?

Cheers,
Joachim


  </pre>
</blockquote>
</body>
</html>

Re: [Kdiff3-user] '-u' option not supported (and needed by svn diff)

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

Am Dienstag, 3. Juli 2007 11:11 schrieb Fr=C3=A9d=C3=A9ric COIFFIER:
> Hi,
>
> If kdiff3 is used with Subversion (as default diff-tool), the -u option
> seems to be mandatory with Subversion 1.4.3.
> This dirty patch can workaround the problem, in main.cpp :
>
> { "config file", I18N_NOOP("Use a different config file."), 0 },
> + { "u", 0, 0 }
> };

Hi Fr=C3=A9d=C3=A9ric,

KDiff3 should already support adding "Ignorable Commandline options" via th=
e=20
option in the integration settings. The default value=20
contains "-u;-query;-html;-abort". So -u should already be ignored.

Doesn't that work correctly? What version do you use number?=20
(Windows/Unix/KDE)?

Cheers,
Joachim

[Kdiff3-user] '-u' option not supported (and needed by svn diff)

[<fre...@eo...>]

Hi,

If kdiff3 is used with Subversion (as default diff-tool), the -u option
seems to be mandatory with Subversion 1.4.3.
This dirty patch can workaround the problem, in main.cpp :

{ "config file", I18N_NOOP("Use a different config file."), 0 },
+ { "u", 0, 0 }
};

-- 
Frédéric COIFFIER

[Kdiff3-user] Paul K Scrutton is out of the office.

[Paul K S. <pks...@us...>]

I will be out of the office starting  05/31/2007 and will not return until
06/11/2007.

I will not have my work laptop with me during that time, but may be very
occasionally checking email at pa...@pa... (non-confidential
only, please).

Re: [Kdiff3-user] sftp supported?

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

Hi,

sftp should work if it also works in Konqueror. (via KIO-slaves)

Cheers,
Joachim


Am Donnerstag, 31. Mai 2007 14:01 schrieb Neal Becker:
> Is sftp supported?  Doesn't seem to work.
>
> -------------------------------------------------------------------------
> This SF.net email is sponsored by DB2 Express
> Download DB2 Express C - the FREE version of DB2 express and take
> control of your XML. No limits. Just data. Click to get it now.
> http://sourceforge.net/powerbar/db2/
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] sftp supported?

[Neal B. <ndb...@gm...>]

Is sftp supported?  Doesn't seem to work.

Re: [Kdiff3-user] diff/merge algorithm improvements

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

Hi Fran=E7ois,

A feature like you suggest is on my todo list, because I know that it would=
=20
yield many benefits.
But I'm very careful to modify the core algorithms because it took a long t=
ime=20
to get them to be as stable as they are now.

The same probably applies to original GNU-diff. So I think your chances wit=
h=20
KDiff3 are not so bad. But if the original GNU-diff is extended in such a w=
ay=20
I will gladly upgrade KDiff3 as well.

As for the algorithm: One important reason, why this is not a standard feat=
ure=20
yet, is that there is no really universal and fast algorithm. A line based=
=20
diff can be fast because it compares hash values for equal lines, but if=20
lines are not equal the complexity grows quadratically with the maximum=20
distance where a match is searched for and a single comparison already take=
s=20
long. So I would make it an optional feature only.

I'll investigate.

Joachim


Am Freitag, 27. April 2007 17:46 schrieb Fran=E7ois Cerbelle:
> Hi,
>
> I searched throught the list but did not find a similar question to mine.
> The test files are :
> a.txt b.txt c.txt
>  DEF   DZF   ABC
>  GHI   GHI   DEF
>              GHI
>
> When I use KDiff3 with:
> - a and b, it detects that the first line whas modified : OK.
>  a   b
> DEF DZF
> GHI GHI
>
> - a and c, it detects that a new line was added in c : OK.
>  a   c
>     ABC
> DEF DEF
> GHI GHI
>
> - b and c, it detects that  the first line changed and that a new line was
> added : it is true, but not optimal.
>  b   c
> DZF ABC
>     DEF
> GHI GHI
>
> a more logical diff would be :
>  b   c
>     ABC
> DZF DEF
> GHI GHI
>
> - a, b and c : KDiff align DEF(a) with DEF(c) but not with DZF(b), it
> aligns DZF(b) with ABC(c), which is not very logic (from a user point of
> view). In fact, it would be more accurate if the result was :
>  a   b   c
>     DZF ABC
> DEF     DEF
> GHI GHI GHI
>
> a more logical diff would be:
>  a   b   c
>         ABC
> DEF DZF DEF
> GHI GHI GHI
>
> We encountered theses behaviours when using the couple
> Mercurial(hg)/KDiff3 to manage our source repository. Such "more logical"
> or "more smart" diffs would be very useful to merge files.
>
> I think the problem comes from the GNU Diff lib as "vimdiff" (part of
> "vim") has the same behaviour. But as you changed the GNU diff lib, if I
> submit the problem to the GNU Team, I am not sure the fix (if they do)
> will go into KDiff3.
>
> What do you think ? Is it technicaly possible to do such a diff ? Who
> should do it (KDiff or GNU) ? Such a diff does not break the "spirit" of
> diff/KDiff ?
>
> Have a nice day
> Fran=E7ois

[Kdiff3-user] diff/merge algorithm improvements

[<fra...@ce...>]

Hi,

I searched throught the list but did not find a similar question to mine.
The test files are :
a.txt b.txt c.txt
 DEF   DZF   ABC
 GHI   GHI   DEF
             GHI

When I use KDiff3 with:
- a and b, it detects that the first line whas modified : OK.
 a   b
DEF DZF
GHI GHI

- a and c, it detects that a new line was added in c : OK.
 a   c
    ABC
DEF DEF
GHI GHI

- b and c, it detects that  the first line changed and that a new line was
added : it is true, but not optimal.
 b   c
DZF ABC
    DEF
GHI GHI

a more logical diff would be :
 b   c
    ABC
DZF DEF
GHI GHI

- a, b and c : KDiff align DEF(a) with DEF(c) but not with DZF(b), it
aligns DZF(b) with ABC(c), which is not very logic (from a user point of
view). In fact, it would be more accurate if the result was :
 a   b   c
    DZF ABC
DEF     DEF
GHI GHI GHI

a more logical diff would be:
 a   b   c
        ABC
DEF DZF DEF
GHI GHI GHI

We encountered theses behaviours when using the couple
Mercurial(hg)/KDiff3 to manage our source repository. Such "more logical"
or "more smart" diffs would be very useful to merge files.

I think the problem comes from the GNU Diff lib as "vimdiff" (part of
"vim") has the same behaviour. But as you changed the GNU diff lib, if I
submit the problem to the GNU Team, I am not sure the fix (if they do)
will go into KDiff3.

What do you think ? Is it technicaly possible to do such a diff ? Who
should do it (KDiff or GNU) ? Such a diff does not break the "spirit" of
diff/KDiff ?

Have a nice day
François




-- 
Bat. B10 - 6 r d'Andilly - 95600 Eaubonne
SFR : (+33/0) 603 015 512 - FBX : (+33/0) 871 777 756

[Kdiff3-user] Ignored subdirectories deleted during merge

[Vladan B. <vb...@ie...>]

Hi,

I have the following problem:

I'm trying to merge three directories under CVS control and I have 
configured kdiff3 to ignore the subdirectories named CVS.

If I choose to put the results of the merge in directory C, kdiff3 will 
delete some of the ignored CVS subdirectories instead of leaving them 
alone. This happens for the directories where the "A" or "B" merge 
operation is chosen for the entire directory.

The workaround I found is to select "Do nothing" for the directory, and 
then manually set "A" or "B" for each file, but this is really tedious.

Shouldn't selecting the "A", "B" or "C" operation for a directory mean 
that it should be applied to individual files instead of the directory 
itself?

A similar thing happens if the option to create .orig backup files is 
active. In this case the original directory at the destination will be 
renamed into .orig, and the corresponding directory from "A" or "B" 
copied over (but without the ignored files). Here again I lose the CVS 
subdirectory.

Is this the intended behavior, and can it be changed? Or is there 
another way to do it?

Thanks,

Vladan.

-- 
Vladan Bato
vb...@ie...

[Kdiff3-user] feautre requesti/question

[Andrej S. <and...@ya...>]

One thing I have not been able to do in KDiff is swap
the left and right side in merge mode. I am not sure
if this feature exists or not. It is useful when
you're looking at a diff from source control (I
integrate with ClearCase), and one version is in
source control, hence read-only, while the other is
locally checked out or hijacked, so it is writable. I
would like to go into merge mode, and make some tweaks
to the local copy w/o doing an actual merge. However
the default setting puts the original on the left, and
the new on right, so that when I go into merge mode,
the resulting file is the read only copy. It would be
very useful at that point if I could swap the left and
right side, and thereby choose to write to the other
file. Does this make sense?

Thanks,
Andrej

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

[Kdiff3-user] KDiff3-0.9.92 released

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

Hi KDiff3-users,

In the last few months I didn't have much time to spare for KDiff3 so I am 
glad to be able to announce another version, even if it doesn't contain that 
many new features.

Two integration features made it:

- Simplified installation of KDiff3 for Clearcase under Windows.
Some users know that KDiff3 can be used with IBM Rational Clearcase. Up to now 
the setup had to be done manually by editing the map-file. Now you can let 
the installer do this, or enable or disable this later from within KDiff3.
KDiff3 can replace the text-file diff and merge for ascii (or unicode) files.

- Konqueror service menu plugin for KDiff3. 

When I wrote it I didn't realise that Sergey Zorin also ported his 
Diff-Ext-tool to KDEs Konqueror and to Gnome's Nautilus.
And his tool can be configured to be used with other diff-frontends too.
So now you even have choice.

Otherwise I mostly fixed some bugs. Here is the Changelog:

Version 0.9.92 - 2007/04/15
===========================
- Windows installer now allows to install KDiff3 as Clearcase Diff and Merge 
Tool
- Windows installer "SVN Merge tool" corrected: Not creating 
$AppData\Subversion\config subdir anymore.
- KDE-Konqueror plugin: Launch KDiff3 from Konqueror. (Similar to Diff-Ext on 
Windows.)
- Qt4-version
  - Printing crash fixed
  - Compilation issue for Mac fixed
- Dir Rescan keeps settings for Show identical files etc.
- Bugfix: Empty file and not existing file were detected as binary equal.
- Temp file names use the process id in file name to allow several instances.
- Suppress flicker during startup. (Don't show status info window on 
creation.)
- New File comparison mode: Trust the size and date, but use binary comparison 
if date doesn't match (unsafe)
- After explicitely selecting files any file of the selected may be right 
clicked for context menu.
- Open dialog also shows current directories in directory comparison mode.
- Writing a file via --auto option didn't work for relative files.
- New option for history merge: Max number of history entries
- New option "Auto save and quit on merge without conflicts"
- Directory Merge without Case sensitivity: Correct destination filename 
chosen for merge.


The windows-installer should even work if you don't have admin-rights (by 
specifying a directory for which you have write access and disabling 
the "Install for all users"-checkbox later).
Nevertheless I was persuaded to also provide a zip-file with the executables, 
but of course the automatic integration with other tools isn't possible then.

The Mac Universal binary was created again by Michael Schmidt. (Thanks!)

Have fun,
Joachim

Re: [Kdiff3-user] Command line Output

[Vladan B. <vb...@ie...>]

nitin jindal wrote:
> I am working on a project for which I have to compare a lot of files and 
> automatically process the comparison results. So, my question is can 
> kdiff3 be configured to give output in command line, instead of 
> displaying in a gui.

You should probably use diff. It runs from the command line and can 
output the differences in several formats suitable for processing by 
other programs.

The purpose of kdiff3 is to show the differences visually and allow you 
to interactively merge the files.

If you are using Linux, diff is already installed.

If you are using Windows, here you can find a Windows version of diff 
(and other programs from the diffutils package):
<http://gnuwin32.sourceforge.net/packages/diffutils.htm>

-- 
Vladan Bato
vb...@ie...

[Kdiff3-user] Command line Output

[nitin j. <nit...@gm...>]

Hi,

I am working on a project for which I have to compare a lot of files and
automatically process the comparison results. So, my question is can kdiff3
be configured to give output in command line, instead of displaying in a
gui.

Thnx and regards,
Nitin

Re: [Kdiff3-user] history merge does not produce output

[Fabian S. <f...@rt...>]

Hi!

On Fri, 2007-03-30 at 00:11 +0200, Joachim Eibl wrote:
> Hi Fabian,
> 
> Please remove the leading comment "//" from the regexp. Then it should work 
> fine. (It does so on my machine.)

Yes it works on mine too. After reading your suggestion and rereading
the kdiff3 option I now understand it. 

It says "without the leading comment". But somehow I missed the point.
Hmm maybe the option should say "without the leading comment like '*' "
or similar. 

But anyways sorry for my blindness, and thanks a lot.

Fabian