kdiff3-user — User questions about KDiff3.

[Kdiff3-user] some usability improvements

[Markus W. <mar...@go...>]

Hi all,

 I would like to suggest some improvements I have noticed in kdiff3
0.9.88. If they are fixed in 0.9.90, please apologise for this email.

 - It is possible, to copy-paste once and twice from clipboard into
kdiff3 using two and three file comparison view. But if I paste the
third time content from clipboard, one of the three views is closed
and only two views with clipboard content remain.

 - If I paste file names into the Open File Dialog, trailing
characters like carriage return/line feed are not removed. They are
displayed as 'spaces' and kdiff3 reports an error trying to open this
file. It really does not exist caused only by the iterpretation of the
carriage return/line feed.

 For user convenience, they should be removed by kdiff3. Other
trailing characters like spaces are valid in this situation, though.
This happens to me every time i copy file names or file paths out of
PowerDesk (CTRL-O, CTRL-M). Even single file names contain a carriage
return/line feed.

 - Navigating from one 'delta' to the next done via CTRL-UP, -DOWN
works fine, except when trying to move to a delta BEFORE the first one
(which does not exist) or BEJOND last delta, kdiff3 scrolls line wise,
instead of moving to the first respectively last line. This seems to
be more convenient for me.

 Thanks and best regards markus

[Kdiff3-user] Advance to next non-whitespace diff

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

Can this be done?  I want to see the white space diffs but optionally be
able to advance to the next non-whitespace diff.

thanks,

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

Re: [Kdiff3-user] convenience feature request

[Sascha O. <sas...@ga...>]

Am Freitag, 2. Juni 2006 09:21 schrieb Joachim Eibl:
> You might want to try this extension.
> http://kde-apps.org/content/show.php?content=3D13546

thats a nice thingy. any idea how to make this work for remote files and=20
dirs (fish:// and webdav://)? I tried to look why KGet is in the=20
context menus for those, but there seems to be another trick beyond the=20
servicemenus entry to achive this.

>
> I just don't know how to make it part of the KDiff3 installation for
> KDE.

wouldn't copying the the comparetext.desktop file=20
to /usr/share/apps/konqueror/servicemenus/ suffice?


Cheers, Sascha

=2D-=20
Gallileus - the power of knowledge

Gallileus GmbH =A0 =A0=A0 =A0 =A0 =A0 =A0 =A0  =A0 =A0http://www.gallileus.=
info/

Puschkinstra=DFe 1 =A0 =A0 =A0 =A0 =A0 =A0 =A0  =A0 =A0 fon +49-(0)361/541 =
43 80
99084 Erfurt =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0  =A0 fax +49-(0)361/54=
1 43 79
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0  =A0 =
=A0 =A0k...@ga...

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
AKTUELLER HINWEIS (April 2006)

Neue Datenbank des Monats: eBay

Seit einigen Monaten steht Ihnen mit eBay eine weitere
Quelle f=FCr Ihre Literatursuche bei Gallileus zur Verf=FCgung.
Sie k=F6nnen darin sowohl nach neuen als auch nach gebrauchten
B=FCchern und Zeitschriften suchen.

Weitere Informationen finden Sie hier:

http://www.gallileus.info/gallileusnews/DBM_eBay/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Re: [Kdiff3-user] convenience feature request

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

Hi,

Am Samstag, 20. Mai 2006 14:49 schrieb Peter Potthoff:
> Hi,
>
> it would be much easier to compare different files or
> directories if you could select them in the konquerer
> fileswindow and directly start kdiff3 from there.

You might want to try this extension.
http://kde-apps.org/content/show.php?content=13546

I just don't know how to make it part of the KDiff3 installation for KDE.


> It is possible to add a new file association in the
> configure menu of konquerer but it is impossible to
> compare two directories having a different parent
> folder, for example.
>
> On windows systems I worked with the compare tool
> 'beyond compare'. The developers of this tools had
> a good idea to provide a solution for this problem.

On windows I can recommend diff_ext for this purpose:
http://diff-ext.sourceforge.net/

See also this announcement and follow-ups.
http://sourceforge.net/mailarchive/forum.php?thread_id=9018547&forum_id=38851

Cheers,
Joachim

Re: [Kdiff3-user] Comparing partially hardlinked trees

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

Hi Bruno,

This seems very reasonable. I'll investigate.

Cheers,
Joachim


Am Sonntag, 28. Mai 2006 10:23 schrieb Bruno:
> KDiff3 is very slow to compare two (or 3) directory trees where most of the
> files are hardlinked between the trees.
> KDiff3 should detect such hardlinks and skip content comparison in such
> cases as diff does.
>
> Sample tree setup (only the first level shown)
>
> linux.orig/                   linux.mine/
>   arch/                         arch/
>   COPYING         <hardlink>    COPYING
>   crypto/                       crypto/
>   drivers/                      driver/
>   include/                      include/
>   ipc/                          ipc/
>   kernel/                       kernel/
>   MAINTAINERS     <hardlink>    MAINTAINERS
>   mm/                           mm/
>   README          <hardlink>    README
>   scripts/                      scripts/
>   sound/                        sound/
>   block/                        block/
>   CREDITS         <hardlink>    CREDITS
>   Documentation/                Documentation/
>   fs/                           fs/
>   init/                         init/
>   Kbuild          <hardlink>    Kbuild
>   lib/                          lib/
>   Makefile                      Makefile           (different)
>   net/                          net/
>   REPORTING-BUGS  <hardlink>    REPORTING-BUGS
>   security/                     security/
>   usr/                          usr/
>
> As you can see all files which are equal are hardlinked together.
> When comparing two files kdiff3 should first check if the files are on same
> device and have same inode; if so mark files as equal WITHOUT looking at
> the content, otherwise proceed as usual.
> Without such a check it takes an eternity to compare two trees as big as
> kernel tree with only a few changes...
>
> Regards,
> Bruno
>
>
> -------------------------------------------------------
> All the advantages of Linux Managed Hosting--Without the Cost and Risk!
> Fully trained technicians. The highest number of Red Hat certifications in
> the hosting industry. Fanatical Support. Click to learn more
> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

Re: [Kdiff3-user] Current Mac release Intel-only?

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

Hi,

By now an updated universal binary is available which was reported to work.

Cheers,
Joachim

Am Freitag, 19. Mai 2006 17:42 schrieb Martin Girschick:
> Hi,
>
> I just downloaded KDiff 0.9.90 for Mac OS X and although the file is
> named "universal" it doesn't launch on my PowerBook G4. I guess it
> has been compiled for Intel only.
>
> I don't know who is producing the Mac releases but if he or she is on
> the list he might be able to correct that (or at least correct it
> with the next release).
>
> I know use the previous version and like to say: It's a great tool :-).
>
> Cheers,
>
>    Martin
>
>
> -------------------------------------------------------
> Using Tomcat but need to do more? Need to support web services, security?
> Get stuff done quickly with pre-integrated technology to make your job
> easier Download IBM WebSphere Application Server v.1.0.1 based on Apache
> Geronimo
> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

Re: [Kdiff3-user] Is kdiff3 supported for non-administrators?

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

Hi,

Of course KDiff3 should also work for non-administrators, but you already made 
me aware of problems the installer has. I will investigate this.

Am Mittwoch, 31. Mai 2006 17:46 schrieb Amores Perros:
> I just install kdiff3, and discovered that only the administrator
> has access to the shortcut.
>
> Is kdiff3 supported for regular users?
>
> I tried running it anyway as a regular user, by invoking it from
> explorer, and I get a flash as a dialog appears and does some
> sort of progress bar with the letter A on it -- it is all so fast
> that I cannot read it -- then vanishes and another dialog
> appears --not at the same place but way up to the left
> and above where the progress bar was. What was that?
> Did it indicate a problem?

No. It's ok if the progress bar shows shortly during the startup.
The other dialog should then be the open dialog.
Error messages won't disappear on their own, but require user confirmation.

> Note: I installed kdiff3 with all the defaults, which said
> they included explorer integration, but it isn't on my Send To.
> I'm guessing maybe that is only supported for the
> Administrator?

Again this is probably a mistake in the installer.

> I looked at the doc page here
>
> http://kdiff3.sourceforge.net/doc/index.html
>
> but some of the links (such as Introduction into
> Directory Comparison and Merge) aren't hot -- or
> rather, I can see the clickable hand cursor blink
> by really fast, but waving my mouse around over
> the link I cannot find the hot spot.
>
> I looked at the html source, and it looks fine --
> <a> tags with hrefs -- so maybe it is a bug
> in firefox (1.5.0.3) having to do with that page
> or stylesheet?

This seems to be a problem of Firefox with the stylesheet. I also see this 
sometimes. (KDE's Konqueror doesn't seem to have this problem.)
Slowly move the mouse to the upper left corner of the link. Possibly the 
hotspot is there.

> Has anyone with Firefox 1.5 had similar or
> contrary experiences trying to get to the
> docs via this page?
>
>
> Thanks for any tips.

Cheers,
Joachim

[Kdiff3-user] Is kdiff3 supported for non-administrators?

[Amores P. <lif...@gm...>]

I just install kdiff3, and discovered that only the administrator
has access to the shortcut.

Is kdiff3 supported for regular users?

I tried running it anyway as a regular user, by invoking it from
explorer, and I get a flash as a dialog appears and does some
sort of progress bar with the letter A on it -- it is all so fast
that I cannot read it -- then vanishes and another dialog
appears --not at the same place but way up to the left
and above where the progress bar was. What was that?
Did it indicate a problem?

Note: I installed kdiff3 with all the defaults, which said
they included explorer integration, but it isn't on my Send To.
I'm guessing maybe that is only supported for the
Administrator?


I looked at the doc page here

http://kdiff3.sourceforge.net/doc/index.html

but some of the links (such as Introduction into
Directory Comparison and Merge) aren't hot -- or
rather, I can see the clickable hand cursor blink
by really fast, but waving my mouse around over
the link I cannot find the hot spot.

I looked at the html source, and it looks fine --
<a> tags with hrefs -- so maybe it is a bug
in firefox (1.5.0.3) having to do with that page
or stylesheet?

Has anyone with Firefox 1.5 had similar or
contrary experiences trying to get to the
docs via this page?


Thanks for any tips.

[Kdiff3-user] Comparing partially hardlinked trees

[Bruno <bon...@in...>]

KDiff3 is very slow to compare two (or 3) directory trees where most of the 
files are hardlinked between the trees.
KDiff3 should detect such hardlinks and skip content comparison in such cases 
as diff does.

Sample tree setup (only the first level shown)

linux.orig/                   linux.mine/
  arch/                         arch/
  COPYING         <hardlink>    COPYING
  crypto/                       crypto/
  drivers/                      driver/
  include/                      include/
  ipc/                          ipc/
  kernel/                       kernel/
  MAINTAINERS     <hardlink>    MAINTAINERS
  mm/                           mm/
  README          <hardlink>    README
  scripts/                      scripts/
  sound/                        sound/
  block/                        block/
  CREDITS         <hardlink>    CREDITS
  Documentation/                Documentation/
  fs/                           fs/
  init/                         init/
  Kbuild          <hardlink>    Kbuild
  lib/                          lib/
  Makefile                      Makefile           (different)
  net/                          net/
  REPORTING-BUGS  <hardlink>    REPORTING-BUGS
  security/                     security/
  usr/                          usr/

As you can see all files which are equal are hardlinked together.
When comparing two files kdiff3 should first check if the files are on same 
device and have same inode; if so mark files as equal WITHOUT looking at the 
content, otherwise proceed as usual.
Without such a check it takes an eternity to compare two trees as big as 
kernel tree with only a few changes...

Regards,
Bruno

[Kdiff3-user] convenience feature request

[Peter P. <pet...@gm...>]

Hi,

it would be much easier to compare different files or
directories if you could select them in the konquerer 
fileswindow and directly start kdiff3 from there.

It is possible to add a new file association in the
configure menu of konquerer but it is impossible to 
compare two directories having a different parent 
folder, for example.

On windows systems I worked with the compare tool
'beyond compare'. The developers of this tools had
a good idea to provide a solution for this problem.
The program offers two menupoints in the context 
menu of the explorer. One menupoint works like a
memory function: 'compare as left side'. The tool
is started, stores the potential compare target and
returns to the explorer (no gui visible). 
After using this menupoint, another menupoint in
the contextmenu is available: 'compare with left
side'. If you select this option, the compare tool
will be started and automatically compares the two
targets.

regards,
Peter

-- 


Bis zu 70% Ihrer Onlinekosten sparen: GMX SmartSurfer!
      Kostenlos downloaden: http://www.gmx.net/de/go/smartsurfer
    

Re: [Kdiff3-user] Current Mac release Intel-only?

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

Hi Martin,

A colleage was able to do this compilation, but he only had an new Intel, but 
no  PowerPC-Mac to test.

It should be easy to compile from sources though.
(Using the Qt4-version of KDiff3-sources.)

If somebody here on the list can create the required binary, that would be 
great. My only requirement for making the package public would be that Qt4 
must be configure'd with flags "-release -static" before building.

I would also upload a PowerPC-only binary, since the Intel-version is there 
already.

Cheers,
Joachim


Am Freitag, 19. Mai 2006 17:42 schrieb Martin Girschick:
> Hi,
>
> I just downloaded KDiff 0.9.90 for Mac OS X and although the file is
> named "universal" it doesn't launch on my PowerBook G4. I guess it
> has been compiled for Intel only.
>
> I don't know who is producing the Mac releases but if he or she is on
> the list he might be able to correct that (or at least correct it
> with the next release).
>
> I know use the previous version and like to say: It's a great tool :-).
>
> Cheers,
>
>    Martin
>
>
> -------------------------------------------------------
> Using Tomcat but need to do more? Need to support web services, security?
> Get stuff done quickly with pre-integrated technology to make your job
> easier Download IBM WebSphere Application Server v.1.0.1 based on Apache
> Geronimo
> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] Current Mac release Intel-only?

[Martin G. <mg...@gm...>]

Hi,

I just downloaded KDiff 0.9.90 for Mac OS X and although the file is 
named "universal" it doesn't launch on my PowerBook G4. I guess it 
has been compiled for Intel only.

I don't know who is producing the Mac releases but if he or she is on 
the list he might be able to correct that (or at least correct it 
with the next release).

I know use the previous version and like to say: It's a great tool :-).

Cheers,

   Martin

[Kdiff3-user] KDiff3-0.9.90 released

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

Hi KDiff3 users,

KDiff3-0.9.90 is a bugfix release which solves the most pressing bugs that 
were introduced in 0.9.89.

- Fixed KIO-problems of type "File exists" with tempfiles
- Fix for manual alignment with 3 files which caused crash
- Fix for Alt-Left caused crash for leftmost window on windows
- Use of WResizeNoErase|WRepaintNoErase instead of WNoAutoErase (fix for 
compiler error with Qt3.1)
- Removed #include <konq_popupmenu.h> which is (currently) unneeded and 
required extra dependencies.
- Removed "Save/Load Directory Merge State ..." in directory menu. (These 
aren't working yet.)
- Fixed crash when used as Diff-part with KDevelop.
- Preserve executable bit when overwriting an existing file.


But for the daring there is one extra possibility:
- Compilation with Qt4 is now supported (yet without KDE-support)
Download the special source package kdiff3-0.9.90-Qt4.tar.gz and read the 
README which tells you how to compile.
Only open source tools are needed, even under windows.

Cheers,
Joachim

Re: [Kdiff3-user] Error handling "=?iso-8859-15?q?=AC?=" (x'AC')

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

Hi John,

Since it seems to work for me, could you please check which encoding you us=
e.
("Regional Settings", "File Encoding for A" etc.)

Since you're under Windows I recommend the "System"-encoding, except if you=
r=20
file was encoded differently. (KDiff3 doesn't yet detect the encoding=20
automatically, but that's planned for a future version.)

In KDiff3-0.9.89 the default-encoding would be the systems default (i.e.=20
"System" on Windows), but if you had 0.9.88 installed previously then the=20
setting might still be UTF-8.

Cheers,
Joachim



Am Montag, 1. Mai 2006 18:13 schrieb John W Greenley Jr:
> My source has a "=AC" (x'AC') within it.
> (If you can't see it here, it looks like a horizontal bar with a short
> vertical descender on the right side.  Sometimes called a "Lazy J", often
> used as a NOT charactor on IBM EBCDIC systems.)
>
> Windows 2000 r5.00.2195 Service Pack 4
> KDiff3 0.9.89
>
> Comparing the following two line:
>
> #1
>                % &EXEC-DLI-REL-OPR-5 =3D "NE=AC=3D"
> #2
>                % &EXEC-DLI-REL-OPR-5 =3D "NE=3D"
> (The "=AC" is between the NE and the " in line #1)
>
> KDIFF3 reports that the "files have equal text but are not binary equal."=
=20
> The KDiff3 display omits the "=AC".
> Other editors and applications do show the "=AC".
>
> More important, in a 3way compare/merge, Kdiff 3 neither reports the
> presence of the "=AC" NOR saves it in the merged output.
>
> Am I missing a setting or option somewhere?
>
>
> -------------------------------------------------------
> Using Tomcat but need to do more? Need to support web services, security?
> Get stuff done quickly with pre-integrated technology to make your job
> easier Download IBM WebSphere Application Server v.1.0.1 based on Apache
> Geronimo
> http://sel.as-us.falkag.net/sel?cmd=3Dlnk&kid=3D120709&bid=3D263057&dat=
=3D121642
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] Error handling "¬" (x'AC')

[John W G. Jr <JOH...@bc...>]

My source has a "¬" (x'AC') within it.
(If you can't see it here, it looks like a horizontal bar with a short
vertical descender on the right side.  Sometimes called a "Lazy J", often used
as a NOT charactor on IBM EBCDIC systems.)

Windows 2000 r5.00.2195 Service Pack 4
KDiff3 0.9.89

Comparing the following two line:

#1
               % &EXEC-DLI-REL-OPR-5 = "NE¬="
#2
               % &EXEC-DLI-REL-OPR-5 = "NE="
(The "¬" is between the NE and the " in line #1)

KDIFF3 reports that the "files have equal text but are not binary equal."  The
 KDiff3 display omits the "¬".
Other editors and applications do show the "¬".

More important, in a 3way compare/merge, Kdiff 3 neither reports the presence
of the "¬" NOR saves it in the merged output.

Am I missing a setting or option somewhere?

[Kdiff3-user] KDiff3-0.9.89 for Qt4 in subversion repository

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

Hi KDiff3 users,

For those interested in helping with KDiff3 on Windows:

I've ported KDiff3 0.9.89 to run with Qt4 which exists in an open source 
version for Windows too (Qt4.1.2 for MinGW).
http://www.trolltech.com/download/qt/windows.html

For the moment this is only on the subversion-repository.
http://sourceforge.net/svn/?group_id=58666
http://svn.sourceforge.net/viewcvs.cgi/kdiff3/trunk/kdiff3/src/

Cheers,
Joachim

Re: [Kdiff3-user] error/bug in 0.9.89 ?

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

Hi Sascha,

Thanks for the report.

This is of course a regression and I suppose it is because I didn't use (i.e. 
test) the KIO-features recently.

I'll fix it of course, but for the moment please continue with 0.9.88 if you 
need the KIO-stuff.

I'll put a note on the homepage for the moment.

Cheers,
Joachim

Am Dienstag, 11. April 2006 12:17 schrieb Sascha Ottolski:
> Hi everybody,
>
> I'm a satisfied kdiff3 user for quite a while now, thanks for such a
> great tool! I've justed seen that a new version is out and wanted to
> give it a whirl (on kde 3.5.2, fedora core 5; sf's cvs isn't updated
> yet, so I downloaded the release). Unfortunately, it bites me :-(
>
> When I try to recursivly compare two directories, both opened via
> "fish://", I see an error like this on _every_ file that is opened:
>
> "Eine Datei namens /tmp/kde-so/kdiff3ZTVaVb.tmp
> existiert bereits."
>
> (A file named /tmp/kde-so/kdiff3ZTVaVb.tmp already exists)
>
> Of course I tried to clean the dir before starting kdiff3, but
> unfortunately this doesn't make the problem dissappear.
>
> Any idea what's causing this?
>
>
> Thanks,
>
> Sascha

[Kdiff3-user] error/bug in 0.9.89 ?

[Sascha O. <sas...@ga...>]

Hi everybody,

I'm a satisfied kdiff3 user for quite a while now, thanks for such a=20
great tool! I've justed seen that a new version is out and wanted to=20
give it a whirl (on kde 3.5.2, fedora core 5; sf's cvs isn't updated=20
yet, so I downloaded the release). Unfortunately, it bites me :-(

When I try to recursivly compare two directories, both opened via=20
"fish://", I see an error like this on _every_ file that is opened:
=20
"Eine Datei namens /tmp/kde-so/kdiff3ZTVaVb.tmp
existiert bereits."

(A file named /tmp/kde-so/kdiff3ZTVaVb.tmp already exists)

Of course I tried to clean the dir before starting kdiff3, but=20
unfortunately this doesn't make the problem dissappear.

Any idea what's causing this?


Thanks,

Sascha

=2D-=20
Gallileus - the power of knowledge

Gallileus GmbH =A0 =A0=A0 =A0 =A0 =A0 =A0 =A0  =A0 =A0http://www.gallileus.=
info/

Puschkinstra=DFe 1 =A0 =A0 =A0 =A0 =A0 =A0 =A0  =A0 =A0 fon +49-(0)361/541 =
43 80
99084 Erfurt =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0  =A0 fax +49-(0)361/54=
1 43 79
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0  =A0 =
=A0 =A0k...@ga...

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
AKTUELLER HINWEIS (April 2006)

Neue Datenbank des Monats: eBay

Seit einigen Monaten steht Ihnen mit eBay eine weitere
Quelle f=FCr Ihre Literatursuche bei Gallileus zur Verf=FCgung.
Sie k=F6nnen darin sowohl nach neuen als auch nach gebrauchten
B=FCchern und Zeitschriften suchen.

Weitere Informationen finden Sie hier:

http://www.gallileus.info/gallileusnews/DBM_eBay/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Re: [Kdiff3-user] KDiff3-0.9.89 released

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

Hi Lieven,

You looked into the right place but Sourceforge also mirrors the CVS for the 
webaccess and anonymous users. This takes a while.

I've attached the current kdiff3.nsi-file (which is still based on NSIS 
2.0beta3, because I didn't find time to upgrade yet).

Cheers,
Joachim



Am Montag, 10. April 2006 17:14 schrieb Lieven Govaerts:
> Joachim ,
>
> I'm glad you still found the time to make a new release, with an impressive
> changelog as I may say so. Thanks!
>
> Two remarks/questions:
> - I've sent you the patch for the TortoiseSVN integration some time ago,
> and I see it has been included in this release. I know now there is a
> slightly better way of integrating with TSVN, and I think it's worthwhile
> to update it. I'll send you a small patch later this week.
>
> - We normally make a custom installer for KDiff3 for internal usage, but to
> do that I need the kdiff3.nsi file. I suppose this file has been updated
> with this new version (with all the new translation files...), but I don't
> seem to find it in the CVS repository at
> http://cvs.sourceforge.net/viewcvs.py/kdiff3/kdiff3/windows_installer/ .
> In fact, it seems none of the source files are updated in CVS. Did
> something change? Can you publish that kdiff3.nsi file somewhere?
>
> Thanks for your time to build such a great tool!
>
> Lieven.

Re: [Kdiff3-user] KDiff3-0.9.89 released

[Lieven G. <lg...@mo...>]

Joachim ,

I'm glad you still found the time to make a new release, with an impressive
changelog as I may say so. Thanks!

Two remarks/questions:
- I've sent you the patch for the TortoiseSVN integration some time ago, and I
see it has been included in this release. I know now there is a slightly better
way of integrating with TSVN, and I think it's worthwhile to update it. I'll
send you a small patch later this week.

- We normally make a custom installer for KDiff3 for internal usage, but to do
that I need the kdiff3.nsi file. I suppose this file has been updated with this
new version (with all the new translation files...), but I don't seem to find it
in the CVS repository at
http://cvs.sourceforge.net/viewcvs.py/kdiff3/kdiff3/windows_installer/ .
In fact, it seems none of the source files are updated in CVS. Did something
change? Can you publish that kdiff3.nsi file somewhere?

Thanks for your time to build such a great tool!

Lieven.


Quoting Joachim Eibl <joa...@gm...>:

> Hi KDiff3-users,
>
> After more than one year I'm glad to finally announce a new release of
> KDiff3.
>
> There are many new features which took much longer to complete than expected:
>
> - Manual alignment of lines in the diff-input. This was often asked for,
>   but was very difficult, especially for three input files.
>
> - Printing of diff input. (Lot's of work, but at least no unexpected issues.)
>
> - Automatic merging of version control history (ie. $Log$). (Also a very
>   big effort. This was partly sponsored by my employer.)
>
> - Dir-show identical/different/A-only/B-only/C-only files with immediate
>    effect (instead of option "List only deltas"). If you often compare
>    directories, you will like this.
>
> - Auto merge regular expression (for version control keywords)
>
> - Splitting and joining differences for merging (asked for several times,
>   here you are.)
>
> - Colorsettings for Dir-Colors
>
> - Filename-edit above DiffInputWindows
>
> - Windows-Context Menu in A/B/C-columns for dir-comparison (Windows only)
>    (Right-click onto the icon in the A/B/C-columns.)
>
> - Edit Menu: Select All (Ctrl-A)
>
> - New commandline options:
>   --config filename: Select an individual config file.
>      (Now also available for Windows and Qt-only version.)
>      This was previously only available under KDE and probably not known.
>      I hope this helps those, who asked for something like projects.
>
>   --cs config: Change one specific setting via the command line.
>       (For settings that were previously adjustable via GUI only.)
>
>   --confighelp: Show available config items and their current values.
>
>
> - Dircomp: "Compare/Merge explicitly selected files"
>     (Select files/dirs for comparison by clicking icons in columns A/B/C)
>
> - User definable ignored command line options.
>     Specifiy options to be ignored, when kdiff3 is called
>     by your favorite tool.
>
> - "Ignore"-button in error dialog when option not understood (Windows only)
>
> - Ability to swap pathnames in open dialog
>     Many people asked for a "Swap left/right"-button.
>     Since there are not only two windows, but four, the solution isn't
>     that simple. I hope this achieves the purpose.
>
> - Quadratical scroll speedup during selection when mouse moves out
>    of the diff input window.
>
> - Plus many bugs fixed. (see the ChangeLog)
>
> - Improved documentations, and updated translation.
>
> One of the next steps will be a port to Qt4, allowing Windows-users to
> participate in development.
>
> Goodbye for now, and have fun with the new version of KDiff3!
>
> Joachim
>
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by xPML, a groundbreaking scripting language
> that extends applications into web and mobile media. Attend the live webcast
> and join the prime developer group breaking into this new coding territory!
> http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user
>




----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.

Re: [Kdiff3-user] KDiff3-0.9.89 released

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

Great news! Thanks!

Joachim Eibl wrote:

>Hi KDiff3-users,
>
>After more than one year I'm glad to finally announce a new release of KDiff3.
>
>There are many new features which took much longer to complete than expected:
>
>- Manual alignment of lines in the diff-input. This was often asked for, 
>  but was very difficult, especially for three input files.
>
>- Printing of diff input. (Lot's of work, but at least no unexpected issues.)
>
>- Automatic merging of version control history (ie. $Log$). (Also a very 
>  big effort. This was partly sponsored by my employer.)
>
>- Dir-show identical/different/A-only/B-only/C-only files with immediate
>   effect (instead of option "List only deltas"). If you often compare
>   directories, you will like this.
>
>- Auto merge regular expression (for version control keywords)
>
>- Splitting and joining differences for merging (asked for several times, 
>  here you are.)
>
>- Colorsettings for Dir-Colors
>
>- Filename-edit above DiffInputWindows
>
>- Windows-Context Menu in A/B/C-columns for dir-comparison (Windows only)
>   (Right-click onto the icon in the A/B/C-columns.)
>
>- Edit Menu: Select All (Ctrl-A)
>
>- New commandline options:
>  --config filename: Select an individual config file. 
>     (Now also available for Windows and Qt-only version.)
>     This was previously only available under KDE and probably not known.
>     I hope this helps those, who asked for something like projects.
>
>  --cs config: Change one specific setting via the command line. 
>      (For settings that were previously adjustable via GUI only.)
>
>  --confighelp: Show available config items and their current values.
>
>
>- Dircomp: "Compare/Merge explicitly selected files" 
>    (Select files/dirs for comparison by clicking icons in columns A/B/C)
>
>- User definable ignored command line options.
>    Specifiy options to be ignored, when kdiff3 is called 
>    by your favorite tool.
>
>- "Ignore"-button in error dialog when option not understood (Windows only)
>
>- Ability to swap pathnames in open dialog
>    Many people asked for a "Swap left/right"-button. 
>    Since there are not only two windows, but four, the solution isn't 
>    that simple. I hope this achieves the purpose.
>
>- Quadratical scroll speedup during selection when mouse moves out 
>   of the diff input window.
>
>- Plus many bugs fixed. (see the ChangeLog)
>
>- Improved documentations, and updated translation.
>
>One of the next steps will be a port to Qt4, allowing Windows-users to 
>participate in development.
>
>Goodbye for now, and have fun with the new version of KDiff3!
>
>Joachim
>  
>

[Kdiff3-user] KDiff3-0.9.89 released

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

Hi KDiff3-users,

After more than one year I'm glad to finally announce a new release of KDiff3.

There are many new features which took much longer to complete than expected:

- Manual alignment of lines in the diff-input. This was often asked for, 
  but was very difficult, especially for three input files.

- Printing of diff input. (Lot's of work, but at least no unexpected issues.)

- Automatic merging of version control history (ie. $Log$). (Also a very 
  big effort. This was partly sponsored by my employer.)

- Dir-show identical/different/A-only/B-only/C-only files with immediate
   effect (instead of option "List only deltas"). If you often compare
   directories, you will like this.

- Auto merge regular expression (for version control keywords)

- Splitting and joining differences for merging (asked for several times, 
  here you are.)

- Colorsettings for Dir-Colors

- Filename-edit above DiffInputWindows

- Windows-Context Menu in A/B/C-columns for dir-comparison (Windows only)
   (Right-click onto the icon in the A/B/C-columns.)

- Edit Menu: Select All (Ctrl-A)

- New commandline options:
  --config filename: Select an individual config file. 
     (Now also available for Windows and Qt-only version.)
     This was previously only available under KDE and probably not known.
     I hope this helps those, who asked for something like projects.

  --cs config: Change one specific setting via the command line. 
      (For settings that were previously adjustable via GUI only.)

  --confighelp: Show available config items and their current values.


- Dircomp: "Compare/Merge explicitly selected files" 
    (Select files/dirs for comparison by clicking icons in columns A/B/C)

- User definable ignored command line options.
    Specifiy options to be ignored, when kdiff3 is called 
    by your favorite tool.

- "Ignore"-button in error dialog when option not understood (Windows only)

- Ability to swap pathnames in open dialog
    Many people asked for a "Swap left/right"-button. 
    Since there are not only two windows, but four, the solution isn't 
    that simple. I hope this achieves the purpose.

- Quadratical scroll speedup during selection when mouse moves out 
   of the diff input window.

- Plus many bugs fixed. (see the ChangeLog)

- Improved documentations, and updated translation.

One of the next steps will be a port to Qt4, allowing Windows-users to 
participate in development.

Goodbye for now, and have fun with the new version of KDiff3!

Joachim

[Kdiff3-user] Annoying blinking

[Nadim K. <na...@kh...>]

Is there a way to get rid of the blinking of the status dialog that is 
displayed at the begining of KDiff3 run. This happends when you compare 
directories with a lot of entries.

Cheers, Nadim.

Re: [Kdiff3-user] Customizing key bindings?

[Juergen N. <jue...@ne...>]

Johan Holmberg wrote:

> Since movement between "Merge Conflicts" is done with Ctrl-Up and 
> Ctrl-Down, I would have liked if Ctrl-Left and Ctrl-Right would do the 
> selection that is now done with Ctrl-1 and Ctrl-2.

But there is not only Ctrl-1 and Ctrl-2, but also Ctrl-3 with 3-way 
merges, by far the most common and important merge scenario for me 
(and probably others). Having to select (and deselect!) with multiple 
presses of Ctrl-Left/Right would be very awkward. I could imagine 
having both key bindings at the same time, although I am not really 
fond of it.

(BTW, I am not a big fan of Ctrl-1/2/3 either. Being stuck with a 
QT-only kdiff3 on Solaris 10/x86, i. e. without KDE's help for 
changing key bindings, I still think it is better than go through the 
build process again. :-)

Regards, Juergen.

-- 
Juergen Nickelsen, Software Developer
Netzwert AG, An den Treptowers 1, 12435 Berlin, Germany
Voice: +49.30.590080-1112, Fax: +49.30.5900800-700
http://www.netzwert.ag/

Re: [Kdiff3-user] Customizing key bindings?

[Johan H. <hol...@ia...>]

Joachim Eibl wrote:
> Hi Johan,
> 
> On Tuesday, 7. March 2006 14:38, Johan Holmberg wrote:
>> Is it possible to change the keys used in "merge mode" to select between
>> lines from file A or B. I would like to avoid the current settings where
>> I have to press two keys on my keyboard (e.g. "Ctrl" and "1") for each
>> selection.
> 
> Changing the keys is possible under KDE or directly in the source.
> 

I see. Unfortunately I use kdiff3 on Windows :)

>> Instead I would like to use some "free" key, for example a function key
>> (one of F1, F2, F3, ... if one happens to be free), or some other
>> one-keystroke-key.
> 
> The keys F1 (help), F3 (find next), F5 (reload), F6 (run operation for current 
> item) and F7 (start directory merge) are already in use.
> 
> Would F10,F11,F12 be ok?
> 

I'm quite new to kdiff3, so I have no definite opinion yet.

On a general level, what I wanted was to have key bindings that will 
make it easy to "process" a merge between two files, with minimal 
movement of my fingers (in the same "spirit" as many modules in Emacs 
for example).

Since movement between "Merge Conflicts" is done with Ctrl-Up and 
Ctrl-Down, I would have liked if Ctrl-Left and Ctrl-Right would do the 
selection that is now done with Ctrl-1 and Ctrl-2. Then I could hold 
Ctrl permanently pressed, and just use the arrows to move AND select.

I don't know if this would fit into the general kdiff3-style of key 
bindings. Probably not, since I see now that Ctrl-Right is 
"forward-word" in other situations.

Maybe there is some other intuitive and finger-friendly key setup that 
is still "free" to use?

Thanks for a great tool,
/Johan Holmberg