kdiff3-user — User questions about KDiff3.

Re: [Kdiff3-user] kdiff3-0.9.94 creates merge with wrong file mode!

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

Hi,

Jan Hustak (Sourceforge user zenyatta) was so kind to send information on how 
to fix the problem:

https://sourceforge.net/tracker/?func=detail&atid=488548&aid=2229554&group_id=58666

Comment By: Jan Hustak (zenyatta)
Date: 2009-02-12 13:05

Message:
I have traced this to a modification of src-QT4/fileaccess.cpp in revision
79 (KDiff3 0.9.91). On lines 412-418, a block of code is commented out and
replaced by the statement "f.setPermissions(QFile::ExeUser);" which I
believe was meant to be "f.setPermissions(f.permissions() |
QFile::ExeUser);". After I patched fileaccess.cpp on my system (Ubuntu
Intrepid x86) the bug disappeared; everything seems to be fine.
Unfortunately, I'm unable to attach a patch file via this tracker's UI.

Thanks,
Joachim

fileaccess.cpp
@@ -414,7 +414,7 @@
          if ( isExecutable() )  // value is true if the old file was 
executable
          {
             // Preserve attributes
-            f.setPermissions(QFile::ExeUser);
+            f.setPermissions(f.permissions() | QFile::ExeUser);
             //struct stat srcFileStatus;




Am Tuesday 10 February 2009 20:13:47 schrieb Neal Becker:
> On Tuesday 10 February 2009, Joachim Eibl wrote:
> > Am Tuesday 10 February 2009 17:26:39 schrieb Neal Becker:
> > > I just found that when kdiff3-0.9.94 creates a merged file, it has
> > > ridiculous mode.  This screws up hg merge!
> >
> > Hi Neal,
> >
> > Could you please provide more information, or example data?
> > "Ridiculous" is somewhat vague.
> >
> > Best regards,
> > Joachim
>
> File was created with a mode -x------- IIRC
>
> ---------------------------------------------------------------------------
>--- Create and Deploy Rich Internet Apps outside the browser with
> Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing
> skills and code to build responsive, highly engaging applications that
> combine the power of local resources and data with the reach of the web.
> Download the Adobe AIR SDK and Ajax docs to start building applications
> today-http://p.sf.net/sfu/adobe-com
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] Unable to get sftp://root@host to work

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

I was unable to compare 2 files where each was

sftp://root@host1/blah
sftp://root@host2/blah

Always got an error message on one of the files or the other

[Kdiff3-user] kdiff3 crash

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

I tried to open a file as sftp://root@host and got a crash:

Re: [Kdiff3-user] kdiff3-0.9.94 creates merge with wrong file mode!

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

On Tuesday 10 February 2009, Joachim Eibl wrote:
> Am Tuesday 10 February 2009 17:26:39 schrieb Neal Becker:
> > I just found that when kdiff3-0.9.94 creates a merged file, it has
> > ridiculous mode.  This screws up hg merge!
>
> Hi Neal,
>
> Could you please provide more information, or example data?
> "Ridiculous" is somewhat vague.
>
> Best regards,
> Joachim
>
File was created with a mode -x------- IIRC

Re: [Kdiff3-user] kdiff3-0.9.94 creates merge with wrong file mode!

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

Am Tuesday 10 February 2009 17:26:39 schrieb Neal Becker:
> I just found that when kdiff3-0.9.94 creates a merged file, it has
> ridiculous mode.  This screws up hg merge!

Hi Neal,

Could you please provide more information, or example data?
"Ridiculous" is somewhat vague.

Best regards,
Joachim

[Kdiff3-user] kdiff3-0.9.94 creates merge with wrong file mode!

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

I just found that when kdiff3-0.9.94 creates a merged file, it has ridiculous 
mode.  This screws up hg merge!

Re: [Kdiff3-user] BOM mark

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

> Hi,
>
> There are strange differences between 0.9.92 and 0.9.94. I installed
> 0.9.92, then 0.9.93, later 0.9.94 on Windows, without changing
> any settings manually.
> - For some reason in Setting/Regional Settings encoding is changed from
> System to UTF-8.
> - For some reason KDiff3 converts files from DOS CRLF to Unix LF format,
> even though neither input file has Unix format.

Hi,

Could you please give me more details:
- What's the setting for line endings in the Diff-settings tab?
- What encoding is used when choosing it manually?
- Do the problems persist?

I wasn't able to reproduce this. On my machine everything seems Ok.

Did anyone else experience such a problem?

Joachim

Re: [Kdiff3-user] BOM mark

[Som-Som <som...@gm...>]

Hi,

There are strange differences between 0.9.92 and 0.9.94. I installed 
0.9.92, then 0.9.93, later 0.9.94 on Windows, without changing
any settings manually.
- For some reason in Setting/Regional Settings encoding is changed from
System to UTF-8.
- For some reason KDiff3 converts files from DOS CRLF to Unix LF format,
even though neither input file has Unix format.

Som-Som

> Hi Ben,
>
> In 0.9.93 there was a bug that prevented that.
> In 0.9.94 you can save with UTF8 or UTF8-BOM.
> Is this what you need?
>
> For UTF16 you can't disable the BOM.
>
> Joachim
>
> Am Monday 02 February 2009 18:56:35 schrieb ben sagal:
>   
>> Is there a way to save the output without the BOM mark?
>>
>> Ben
>>
>> ---------------------------------------------------------------------------
>> --- This SF.net email is sponsored by:
>> SourcForge Community
>> SourceForge wants to tell your story.
>> http://p.sf.net/sfu/sf-spreadtheword
>> _______________________________________________
>> Kdiff3-user mailing list
>> Kdi...@li...
>> https://lists.sourceforge.net/lists/listinfo/kdiff3-user
>>     
>
>
>
> ------------------------------------------------------------------------------
> This SF.net email is sponsored by:
> SourcForge Community
> SourceForge wants to tell your story.
> http://p.sf.net/sfu/sf-spreadtheword
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user
>   

Re: [Kdiff3-user] BOM mark

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

Hi Ben,

In 0.9.93 there was a bug that prevented that.
In 0.9.94 you can save with UTF8 or UTF8-BOM.
Is this what you need?

For UTF16 you can't disable the BOM.

Joachim

Am Monday 02 February 2009 18:56:35 schrieb ben sagal:
> Is there a way to save the output without the BOM mark?
>
> Ben
>
> ---------------------------------------------------------------------------
>--- This SF.net email is sponsored by:
> SourcForge Community
> SourceForge wants to tell your story.
> http://p.sf.net/sfu/sf-spreadtheword
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] BOM mark

[ben s. <ben...@ya...>]

Is there a way to save the output without the BOM mark?

Ben

Re: [Kdiff3-user] Opening of folders that contain apostrophs '

[ms <ms...@as...>]

...forgot to mention that I open these files via "Send to" context
menu! Opening the files by File-Open works fine!


Am 26.01.2009 um 15:02 schrieb ms in der Nachricht mit dem
Betreff: "[Kdiff3-user] Opening of folders that contain apostrophs '"

> Hallo Joachim,

> When I try to open a folder that contains an apostrophe ' (which is
> valid in windows) kdiff3 throws an error:

> -------------------
> Opening of these files failed:
> C:\Documents and Settings\negg''@_\texte\text.txt
> -------------------

> The correct path is:
> C:\Documents and Settings\negg\''@_\texte\text.txt

> Not an important bug, but a little annoying anyway ;-)

> Viele Grüße,
> Martin

[Kdiff3-user] Opening of folders that contain apostrophs '

[ms <ms...@as...>]

Hallo Joachim,

When I try to open a folder that contains an apostrophe ' (which is
valid in windows) kdiff3 throws an error:

-------------------
Opening of these files failed:
C:\Documents and Settings\negg''@_\texte\text.txt
-------------------

The correct path is:
C:\Documents and Settings\negg\''@_\texte\text.txt

Not an important bug, but a little annoying anyway ;-)

Viele Grüße,
Martin

Re: [Kdiff3-user] display eol characters

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

> can kdiff3 be made to (as a option) compare and display eol
> characters?

I already investigated this, and it is not so easy to do, since the 
information is lost after preprocessing, codec conversions etc.

But most of the time not all the details are needed, but only what line end 
style is used for each input (assuming that it's consistent).

From 0.9.93 on this information is shown, when doing a merge in the line end 
style combobox.

I admit that this info would be nice to have for a normal diff too (without 
having to start a merge) and will do something in that direction.

Joachim

Re: [Kdiff3-user] KDiff3-0.9.94 released

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

Am Sunday 18 January 2009 07:42:15 schrieb David M. Besonen:
> thank you Joachim.
>
>
> when you get a chance could you provide the MD5 values again?
>

Here you are:

MD5 sums:
8bf580e53a420b1aa1eca3ea502bbe8b  kdiff3-0.9.94.tar.gz
9047b48f8ea6d22a0cdd8386f1b9790c  KDiff3Setup_0.9.94.exe

I also put them in the sourceforge release notes:
http://sourceforge.net/project/shownotes.php?group_id=58666&release_id=654466

Joachim

> peace,
> david
>
> ---------------------------------------------------------------------------
>--- This SF.net email is sponsored by:
> SourcForge Community
> SourceForge wants to tell your story.
> http://p.sf.net/sfu/sf-spreadtheword
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] display eol characters

[David M. B. <da...@pa...>]

can kdiff3 be made to (as a option) compare and display eol
characters?


  -- david

Re: [Kdiff3-user] KDiff3-0.9.94 released

[David M. B. <da...@pa...>]

thank you Joachim.


when you get a chance could you provide the MD5 values again?



peace,
david

[Kdiff3-user] KDiff3-0.9.94 released

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

Hi KDiff3-users,

This version fixes some bugs. 
Especially the --auto flag caused empty windows to appear. This affected many 
version control systems like git or mercury that use it.

Version 0.9.94 - 2009/01/17
===========================
- Fix for hidden text windows with --auto-flag.
- Fix for pasting clipboard truncated text if it contained characters that 
needed more than one byte in UTF-8 encoding.
- Fix for horizontal scrolling if word wrap is enabled.
- Directory tree: files hidden due to options (e.g. patterns etc.) don't 
affect folder equality any more.
- KDE: KIO-progress dialog is now hidden. (KDiff3 has its own progress 
dialog.)
- Directory merge: Default op for change in either B or C and delete in the 
other is now merge (previously copy).
- Directory merge: Not preserving merge operation after reload, because it 
might have changed.


For 0.9.93 I forgot to mention this important change:

- Option to align B and C for 3 input files (default is off which is usually 
better for merging).

The reason behind this is that since 0.9.89 in three way diffs and merges B 
and C were aligned if possible. This was requested by a user, but by now I 
think this was a bad idea, because the alignment often aligned trivial (e.g. 
empty) lines and broke bigger merge blocks apart. This might have caused more 
conflicts than necessary. Now I made an option to enable this alignment if 
needed. But the default is off.

Cheers,
Joachim

Re: [Kdiff3-user] kdiff3-0.9.93 final?

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

Am Friday 09 January 2009 15:24:14 schrieb Neal Becker:
> Is kdiff3-0.9.93-3.tar.gz ready to go?

For the moment it's the best I have. Yet I might publish a new version in two 
weeks if severe bugs are reported. Considering how big the step was, there 
might be regressions.

Joachim

[Kdiff3-user] Compile issue in Un*x Qt4 without KDE version

[David K. <dk...@ja...>]

I have compiled KDiff3-0.9.93 version on our AIX system with Qt4 and
without KDE.   I am using gcc version 4.2.4 and QT 4.4.3 and am able to
compile and run the .92 release using this setup without issues.   When
I first ran make I received several compile errors on the first program
and the make stopped.  After some investigation I was able to determine
that adding the following line to
kdiff3-0.9.93/src-QT4/kreplacements/kreplacements.h fixed my compile
issues:
#include <qshareddata.h>
I am not sure if this has something to do with my setup, or is an error
in the distribution but I thought I would pass it along to everyone.

David Klaus
Software Engineer - Product Development
Symitar, A Jack Henry & Associates Company
8985 Balboa Ave
San Diego, CA  92123
dk...@sy...
(619) 542-6700 x763508 


NOTICE: This electronic mail message and any files transmitted with it are intended
exclusively for the individual or entity to which it is addressed. The message, 
together with any attachment, may contain confidential and/or privileged information.
Any unauthorized review, use, printing, saving, copying, disclosure or distribution 
is strictly prohibited. If you have received this message in error, please 
immediately advise the sender by reply email and delete all copies.

[Kdiff3-user] kdiff3-0.9.93 final?

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

Is kdiff3-0.9.93-3.tar.gz ready to go?

Re: [Kdiff3-user] Fwd: Re: new kdiff3 (kde4 port)

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

Am Tuesday 06 January 2009 22:58:16 schrieb David M. Besonen:
> On 1/6/2009 1:24 PM, Joachim Eibl wrote:
> > I've uploaded an update as kdiff3-0.9.93-2.tar.gz on
> > http://downloads.sourceforge.net/kdiff3/kdiff3-0.9.93-2.tar.gz
>
> thanks Joachim.
>
> could you post the MD5 values for both 0.9.93 files:

Last fix for today because saving UTF-8 without BOM didn't work. 
Hence 0.9.93-3

f9a3ac045b3df0a24104a4a5e6299488  kdiff3-0.9.93-3.tar.gz
eca3656e2dcc25cdc74a27ef2dad4241  KDiff3Setup_0.9.93-3.exe

And now I go to bed.

Joachim

Re: [Kdiff3-user] Fwd: Re: new kdiff3 (kde4 port)

[David M. B. <da...@pa...>]

On 1/6/2009 1:24 PM, Joachim Eibl wrote:

> I've uploaded an update as kdiff3-0.9.93-2.tar.gz on 
> http://downloads.sourceforge.net/kdiff3/kdiff3-0.9.93-2.tar.gz

thanks Joachim.

could you post the MD5 values for both 0.9.93 files:

 kdiff3-0.9.93-2.tar.gz
 KDiff3Setup_0.9.93.exe


thanks,
david

Re: [Kdiff3-user] Fwd: Re: new kdiff3 (kde4 port)

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

Am Tuesday 06 January 2009 21:14:41 schrieb Neal Becker:
> We are preparing the fedora package.  We have found that in one test,
> kdiff3 crashes on startup.  It seems to be triggered by an old kdiff3rc
> file.  The file and a backtrace are attached.

Yeah, you're right.
I've uploaded an update as kdiff3-0.9.93-2.tar.gz on 
http://downloads.sourceforge.net/kdiff3/kdiff3-0.9.93-2.tar.gz

Sorry for the inconvenience.
Joachim

Re: [Kdiff3-user] KDiff3-0.9.93 released

[Valentin R. <kd...@ru...>]

On Tue, 2009-01-06 at 16:30 +0100, Joachim Eibl wrote:
> Hi KDiff3-Users,

> Without the help of Valentin Rusu who volunteered to do the port of the build 
> system and made the code compile again against KDE4-libs this wouldn't have 
> happened. - Thanks a lot!
> 

All thanks should go to you for doing such a great and useful program.

:)

Cheers,
Valentin

[Kdiff3-user] Fwd: Re: new kdiff3 (kde4 port)

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

We are preparing the fedora package.  We have found that in one test, kdiff3 
crashes on startup.  It seems to be triggered by an old kdiff3rc file.  The file 
and a backtrace are attached.