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