kdiff3-user — User questions about KDiff3.

Re: [Kdiff3-user] "virtual" directory compare

[Nick <no...@co...>]

The Meld diff/merge tool (http://meld.sourceforge.net) has built-in
knowledge of some version control systems, though I don't know if it
employs a plugin interface for that functionality.  You may want to take
a look at it for ideas on achieving your goal w/ KDiff3. 

Best regards,
Nick


On Thu, 2010-03-18 at 21:36 +0100, Joachim Eibl wrote:

> Hi Wladimir,
> 
> For the moment creating a local copy of your directory is the only 
> possibility.
> 
> Previously I had hopes, that some day a KIO-subsystem would do the job of 
> providing the frontend for a version. (Similar to clearcase dynamic views.) 
> But I don't know the current state about this.
> 
> As you say, a plugin system might help, but a different plugin for each 
> different version control system would be needed.
> 
> Perhaps someone wants to start such a project. It might even be best, if this 
> plugin system were an external library, usable by KDiff3 or other frontends.
> 
> For each VCS the commands and the usage are slightly different, so it would be 
> best if people who know their system and want to do some coding would 
> participate. Possibly I could help with defining the interface of the plugins 
> depending on the needs of KDiff3.
> 
> Or does such a thing already exist?
> 
> Cheers,
> Joachim
> 
> 
> 
> 
> > Hello KDiff3 developers and users,
> > 
> > First, congratulations, in my opinion kdiff3 is the best visual diff/merge
> > tool by far. I especially like the directory comparison.
> > 
> > One of my gripes about version control systems is that they pop up the diff
> > program for each file separately (git difftool, clearcase code inspection,
> > etc all have this problem). This is because they create two or three
> > temporary files, and call the diff tool for each file to be diffed/merged.
> > 
> > What would be the best way to use KDiff3 directory compare functionality in
> > this case, as the directory structure exists nowhere on disk?
> > 
> > The simplest (I guess) would be to make a front-end script that exports the
> > changed files in a temporary directory structure and call kdiff3 on it.
> > Personally, I don't really like the idea of creating a temporary directory
> > structure that much, as they need a (potentially) dangerous recursive
> >  delete to clean up, and leave waste files when the program exits
> >  unexpectedly.
> > 
> > As it is not practical to pass all that data [(path, (date1, content1),
> > (date2, content2), (date3, content3) ), ...] on the command line either,
> > I've been thinking about adding some kind of interface to provide "virtual"
> > files to KDiff3, for example via DBus-QT.  On the other hand, I don't want
> > to be dependent on the VFS services offered by KDE, as that wouldn't port
> >  to windows...
> > 
> > The other option would be to build the actual version control functionality
> > into KDiff3 (for example, using plugins), but I don't like that, as I don't
> > want to make it specific to any VCS, I just want another script or
> > application be able to invoke KDiff3 and compare anything.
> > 
> > So, overall, I guess the option to just create a temporary tree, even
> >  though a bit ugly, might be best...
> > 
> > Any input on this?
> > 
> > Cheers,
> > Wladimir
> > 
> 
> ------------------------------------------------------------------------------
> Download Intel® Parallel Studio Eval
> Try the new software tools for yourself. Speed compiling, find bugs
> proactively, and fine-tune applications for parallel performance.
> See why Intel Parallel Studio got high marks during beta.
> http://p.sf.net/sfu/intel-sw-dev
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

Re: [Kdiff3-user] "virtual" directory compare

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

Hi Wladimir,

For the moment creating a local copy of your directory is the only 
possibility.

Previously I had hopes, that some day a KIO-subsystem would do the job of 
providing the frontend for a version. (Similar to clearcase dynamic views.) 
But I don't know the current state about this.

As you say, a plugin system might help, but a different plugin for each 
different version control system would be needed.

Perhaps someone wants to start such a project. It might even be best, if this 
plugin system were an external library, usable by KDiff3 or other frontends.

For each VCS the commands and the usage are slightly different, so it would be 
best if people who know their system and want to do some coding would 
participate. Possibly I could help with defining the interface of the plugins 
depending on the needs of KDiff3.

Or does such a thing already exist?

Cheers,
Joachim




> Hello KDiff3 developers and users,
> 
> First, congratulations, in my opinion kdiff3 is the best visual diff/merge
> tool by far. I especially like the directory comparison.
> 
> One of my gripes about version control systems is that they pop up the diff
> program for each file separately (git difftool, clearcase code inspection,
> etc all have this problem). This is because they create two or three
> temporary files, and call the diff tool for each file to be diffed/merged.
> 
> What would be the best way to use KDiff3 directory compare functionality in
> this case, as the directory structure exists nowhere on disk?
> 
> The simplest (I guess) would be to make a front-end script that exports the
> changed files in a temporary directory structure and call kdiff3 on it.
> Personally, I don't really like the idea of creating a temporary directory
> structure that much, as they need a (potentially) dangerous recursive
>  delete to clean up, and leave waste files when the program exits
>  unexpectedly.
> 
> As it is not practical to pass all that data [(path, (date1, content1),
> (date2, content2), (date3, content3) ), ...] on the command line either,
> I've been thinking about adding some kind of interface to provide "virtual"
> files to KDiff3, for example via DBus-QT.  On the other hand, I don't want
> to be dependent on the VFS services offered by KDE, as that wouldn't port
>  to windows...
> 
> The other option would be to build the actual version control functionality
> into KDiff3 (for example, using plugins), but I don't like that, as I don't
> want to make it specific to any VCS, I just want another script or
> application be able to invoke KDiff3 and compare anything.
> 
> So, overall, I guess the option to just create a temporary tree, even
>  though a bit ugly, might be best...
> 
> Any input on this?
> 
> Cheers,
> Wladimir
> 

[Kdiff3-user] "virtual" directory compare

[Wladimir v. d. L. <la...@gm...>]

Hello KDiff3 developers and users,

First, congratulations, in my opinion kdiff3 is the best visual diff/merge
tool by far. I especially like the directory comparison.

One of my gripes about version control systems is that they pop up the diff
program for each file separately (git difftool, clearcase code inspection,
etc all have this problem). This is because they create two or three
temporary files, and call the diff tool for each file to be diffed/merged.

What would be the best way to use KDiff3 directory compare functionality in
this case, as the directory structure exists nowhere on disk?

The simplest (I guess) would be to make a front-end script that exports the
changed files in a temporary directory structure and call kdiff3 on it.
Personally, I don't really like the idea of creating a temporary directory
structure that much, as they need a (potentially) dangerous recursive delete
to clean up, and leave waste files when the program exits unexpectedly.

As it is not practical to pass all that data [(path, (date1, content1),
(date2, content2), (date3, content3) ), ...] on the command line either,
I've been thinking about adding some kind of interface to provide "virtual"
files to KDiff3, for example via DBus-QT.  On the other hand, I don't want
to be dependent on the VFS services offered by KDE, as that wouldn't port to
windows...

The other option would be to build the actual version control functionality
into KDiff3 (for example, using plugins), but I don't like that, as I don't
want to make it specific to any VCS, I just want another script or
application be able to invoke KDiff3 and compare anything.

So, overall, I guess the option to just create a temporary tree, even though
a bit ugly, might be best...

Any input on this?

Cheers,
Wladimir

Re: [Kdiff3-user] directory merge without filescan

[Rudolf T. <rh...@yo...>]

OK. Thanks for that.
Now it is a lot faster.

Rudolf
----- Original Message ----- 
From: "Joachim Eibl" <joa...@gm...>
To: <kdi...@li...>
Sent: Thursday, January 21, 2010 8:34 PM
Subject: Re: [Kdiff3-user] directory merge without filescan


> Hi Rudolf,
>
> Check the directory options.
> For file comparison mode use "Trust the size" etc.
>
> The files would be assumed to be equal if their sizes are equal.
> Is that what you expect?
>
> Cheers,
> Joachim
>
>
>>Hi,
>>
>>I use kdiff3 (on a windows PC) for directory merge.
>>I use it to merge now and then two
>>rather big "libraries" containing
>>pdf and djvu files.
>>
>>I am under the impression that
>>it still scans contents of files
>>which takes time.
>>
>>Is it possible to just let it work with filenames, i.e.
>>that it assumes that two files are the same when
>>they have the same name?
>>
>>Of course such a program would be very
>>easy to write, but I don't want to waste time
>>programming, maybe kdiff3 can just do it.
>>
>>
>>Rudolf Tange
>
> ------------------------------------------------------------------------------
> Throughout its 18-year history, RSA Conference consistently attracts the
> world's best and brightest in the field, creating opportunities for 
> Conference
> attendees to learn about information security's most important issues 
> through
> interactions with peers, luminaries and emerging and established 
> companies.
> http://p.sf.net/sfu/rsaconf-dev2dev
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user
> 

Re: [Kdiff3-user] directory merge without filescan

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

Hi Rudolf,

Check the directory options.
For file comparison mode use "Trust the size" etc.

The files would be assumed to be equal if their sizes are equal.
Is that what you expect?

Cheers,
Joachim 


>Hi,
>
>I use kdiff3 (on a windows PC) for directory merge.
>I use it to merge now and then two
>rather big "libraries" containing
>pdf and djvu files.
>
>I am under the impression that
>it still scans contents of files
>which takes time.
>
>Is it possible to just let it work with filenames, i.e.
>that it assumes that two files are the same when
>they have the same name?
>
>Of course such a program would be very
>easy to write, but I don't want to waste time
>programming, maybe kdiff3 can just do it.
>
>
>Rudolf Tange

[Kdiff3-user] directory merge without filescan

[Rudolf T. <rh...@yo...>]

Hi,

I use kdiff3 (on a windows PC) for directory merge.
I use it to merge now and then two 
rather big "libraries" containing
pdf and djvu files.

I am under the impression that
it still scans contents of files
which takes time.

Is it possible to just let it work with filenames, i.e.
that it assumes that two files are the same when
they have the same name?

Of course such a program would be very
easy to write, but I don't want to waste time
programming, maybe kdiff3 can just do it.


Rudolf Tange

[Kdiff3-user] KDiff3-Update to fix Explorer context menus on 64-bit Windows

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

Hi,

Seeing how many emails regarding the explorer context menu extension for 64-
bit Windows I received recently, it seems that Windows 7 is really the first 
widely used 64-bit Windows.

Now I uploaded a new file "KDiff3Setup_0.9.95-2.exe" with a 64-bit context 
menu plugin dll. The installer detects if a 32 or 64 bit systems is used. So 
on a 32-bit system the old plugin dll is installed.
(The KDiff3.exe is still 32-bit.)

Best regards,
Joachim

[Kdiff3-user] Check folder or file names before compare.

[pjemen <pj...@gm...>]

I’m using kdiff3 from command line and sometimes I give to compare the 
same folders.

“Kdiff3 c:\test c:\test”

I would really welcome feature that will warn me that I try comparing 
the same folder or files.


PM-

Re: [Kdiff3-user] Color legend ?

[David B. <xe...@gm...>]

Actually the color was because the change was the current one.
After I moved around with ctrl-up/down it became obvious.

The docs are still lacking tho.

Regards,
David

2009/6/11 Joachim Eibl <joa...@gm...>

> Hi David,
>
> In two file comparison mode there currently both colors mean the same.
>
> The different colors are important when comparing/merging three files.
>
> See:
> http://kdiff3.sourceforge.net/doc/interpretinginformation.html#id2564428
> http://kdiff3.sourceforge.net/doc/merging.html
>
> Cheers,
> Joachim
>
>
> > I am viewing the comparison of two files with KDiff3 version 0.9.95
> >
> > and I see a few lines with olive green background, then the following
> lines
> > with white background.
> > All of the them have changes (added text) at the line end.
> >
> > Simplified in diff form :
> > < line one
> >
> > > line one and some new text
> >
> > < line five
> >
> > > line five and some other new text
> >
> > "line one" has olive background on both left and right panes (and the
> added
> > text in the right pane has light yellow-green background)
> > "line five" has white background, the added part has light gray
> background.
> >
> > Why aren't both changes rendered the same way ? What is the difference ?
> I
> > could find no explanation in the docs.
> >
> > Regards,
> > David
>
>
>
> ------------------------------------------------------------------------------
> Crystal Reports - New Free Runtime and 30 Day Trial
> Check out the new simplified licensing option that enables unlimited
> royalty-free distribution of the report engine for externally facing
> server and web deployment.
> http://p.sf.net/sfu/businessobjects
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user
>

Re: [Kdiff3-user] Color legend ?

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

Hi David,

In two file comparison mode there currently both colors mean the same.

The different colors are important when comparing/merging three files.

See:
http://kdiff3.sourceforge.net/doc/interpretinginformation.html#id2564428
http://kdiff3.sourceforge.net/doc/merging.html

Cheers,
Joachim


> I am viewing the comparison of two files with KDiff3 version 0.9.95
>
> and I see a few lines with olive green background, then the following lines
> with white background.
> All of the them have changes (added text) at the line end.
>
> Simplified in diff form :
> < line one
>
> > line one and some new text
>
> < line five
>
> > line five and some other new text
>
> "line one" has olive background on both left and right panes (and the added
> text in the right pane has light yellow-green background)
> "line five" has white background, the added part has light gray background.
>
> Why aren't both changes rendered the same way ? What is the difference ? I
> could find no explanation in the docs.
>
> Regards,
> David

[Kdiff3-user] Color legend ?

[David B. <xe...@gm...>]

Hi!

I am viewing the comparison of two files with KDiff3 version 0.9.95

and I see a few lines with olive green background, then the following lines
with white background.
All of the them have changes (added text) at the line end.

Simplified in diff form :
< line one
> line one and some new text
< line five
> line five and some other new text

"line one" has olive background on both left and right panes (and the added
text in the right pane has light yellow-green background)
"line five" has white background, the added part has light gray background.

Why aren't both changes rendered the same way ? What is the difference ? I
could find no explanation in the docs.

Regards,
David

Re: [Kdiff3-user] Ignore whitespace

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

Hi Neal,

During line matching phase white space is always ignored. You can't disable 
that. 

But in the view whitespace is highlighted. This can be disabled.

During the merge whitespace changes also cause conflicts which have to be 
solved. But there is a menu option that allows to solve all pure whitespace 
conflicts in favor of A/B or C.

Does this help?

Joachim


Am Freitag 01 Mai 2009 14:43:46 schrieb Neal Becker:
> No switch to ignore whitespace diffs?  I could use that.
>
> ---------------------------------------------------------------------------
>--- Register Now & Save for Velocity, the Web Performance & Operations
> Conference from O'Reilly Media. Velocity features a full day of
> expert-led, hands-on workshops and two days of sessions from industry
> leaders in dedicated Performance & Operations tracks. Use code vel09scf
> and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] Ignore whitespace

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

No switch to ignore whitespace diffs?  I could use that.

[Kdiff3-user] Mac-binary for KDiff3-0.9.95 now available

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

Hi KDiff3-Users,

Cheers to Michael Schmidt who was so kind to create a new Mac-Universal 
binary.

See the download section for 0.9.95:
http://sourceforge.net/project/showfiles.php?group_id=58666&package_id=54597&release_id=665583 

Joachim

Re: [Kdiff3-user] KDiff: Color setup, WinExplorer integration, pref backup problems

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

Hi Ben,
> >>
> >> 1.) I would like to setup the background color of deleted text to red
> >> and the background color for new text to green.
> >This is currently not implemented. Both are shown as conflict (i.e.
> > usually red).
>
> Could you add this background color setup in the next release?
> This is rather important for me.

Perhaps I can do something in that respect, but it's more than just the colors 
in the setup.

> Can I put the .kdiff3rc into the install directory of KDiff?
> That would help me to keep the software portable on my USB stick.
>
> Kdiff should look at startup at first for a .kdiff3rc in its own directory
> before searching at other locations

I don't agree. On a multiuser system (like almost all modern systems) the 
settings should be in the user subdirectory. To write where the executable is 
usually requires admin-rights.
Via commandline option --config <filename> you can specify other locations. 
Perhaps this helps if you wrap the exe with a batch-script or create a link.
Or you could patch: KStandardDirs::findResource() in
src-QT4/kreplacements/kreplacements.cpp appropriately and recompile yourself.

Joachim

Re: [Kdiff3-user] KDiff: Color setup, WinExplorer integration, pref backup problems

[Ben S. <bxs...@ya...>]

Hi Joachim,

comments see inline

>--Original Message Text---
>From: Joachim Eibl
>Date: Fri, 6 Mar 2009 17:30:54 +0100

>> some questions of a new user:
>>
>> 1.) I would like to setup the background color of deleted text to red and
>> the background color for new text to green.
>>
>> How do I do this in KDiff3?
>>
>> When I go to Settings->Configure->Color
>>
>> I miss entries for
>>
>> - Foreground color new
>> - Backgropund color new
>> - Foreground color deleted
>> - Backgropund color deleted

>This is currently not implemented. Both are shown as conflict (i.e. usually red).

Could you add this background color setup in the next release?
This is rather important for me.


>> 4.) How can I export my preferences (for later backup or usage on another
>> computer)? I found no *.ini file in the install dir.

>On Windows your preferences are stored in a file ".kdiff3rc" in the user-subdirectory. 
>e.g. for XP: \Documents and Settings\<username>\.kdiff3rc
>for Vista: \Users\<username>\.kdiff3rc

Can I put the .kdiff3rc into the install directory of KDiff?
That would help me to keep the software portable on my USB stick.

Kdiff should look at startup at first for a .kdiff3rc in its own directory before
searching at other locations

Thank you
Ben

Re: [Kdiff3-user] KDiff: Color setup, WinExplorer integration, pref backup problems

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

Hi Ben,

> some questions of a new user:
>
> 1.) I would like to setup the background color of deleted text to red and
> the background color for new text to green.
>
> How do I do this in KDiff3?
>
> When I go to Settings->Configure->Color
>
> I miss entries for
>
> - Foreground color new
> - Backgropund color new
> - Foreground color deleted
> - Backgropund color deleted

This is currently not implemented. Both are shown as conflict (i.e. usually 
red).

> 2.) I have read that KDiff3 can be integrated in WinExplorer
>
> So I expected that I can mark e.g. two files in a certain directory, then
> right click and find an context menu entry "CKdiff-Compare" or similar.
>
> But I did not found this?
>
> How can I enable context menu entries ?

After installation there should be a submenu "KDiff3" in the contextmenu for 
files and directories in Windows-Explorer. But if it was already running you 
might have to log off or restart the computer first. (Since this isn't the 
main feature of KDiff3 I didn't want to force a restart.)

> 3.) Is there a text comparison mode where onyl these lines are shown which
> are different? if yes: How can I switch between full and diff-only mode?

Sorry, no such mode yet.

> 4.) How can I export my preferences (for later backup or usage on another
> computer)? I found no *.ini file in the install dir.

On Windows your preferences are stored in a file ".kdiff3rc" in the user-
subdirectory. 
e.g. for XP: \Documents and Settings\<username>\.kdiff3rc
for Vista: \Users\<username>\.kdiff3rc

> Thank you
> Ben

Cheers,
Joachim

[Kdiff3-user] KDiff: Color setup, WinExplorer integration, pref backup problems

[Ben S. <bxs...@ya...>]

Hi,

some questions of a new user:

1.) I would like to setup the background color of deleted text to red and the background color for new text to green.

How do I do this in KDiff3?

When I go to Settings->Configure->Color 

I miss entries for

- Foreground color new
- Backgropund color new
- Foreground color deleted
- Backgropund color deleted

2.) I have read that KDiff3 can be integrated in WinExplorer

So I expected that I can mark e.g. two files in a certain directory, then right click and find an context menu entry "CKdiff-Compare" or similar.

But I did not found this?

How can I enable context menu entries ?

3.) Is there a text comparison mode where onyl these lines are shown which are different?
if yes: How can I switch between full and diff-only mode?

4.) How can I export my preferences (for later backup or usage on another computer)?
I found no *.ini file in the install dir.

Thank you
Ben

Re: [Kdiff3-user] KDiff3 0.9.95 released

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

I am compiling KDiff3 0.9.95 on our AIX system and have hit a minor issue.  In optiondialog.cpp I found it was necessary to add the line #include <QDir> .   Once I had made that change, I was able to successfully compile and link KDiff3.

From: Joachim Eibl [mailto:joa...@gm...]
Sent: Tuesday, March 03, 2009 3:15 PM
To: kdi...@li...
Subject: [Kdiff3-user] KDiff3 0.9.95 released

Hi,



Changelog:



Version 0.9.95 - 2009/03/03
===========================
- Show line end style for each file.
- Updated message translations.
- Fixed permissions when writing executable file. (Un*x only)
- Fixed IgnorableCmdLineOptions (important for SVNs '-u'-option)
- Directory merge: Error when either B or C is changed and the other is deleted. (User choice required.)
- Qt-only Un*x-version looks for translations in /usr/share/locale/<lang>/LC_MESSAGES/kdiff3.qm
(for Debian, by Eike Sauer)
- New script: po/create_qm_files: To create and install translations for Qt-only version.



MD5 sums:
33840c3b8a3d1acfd2fdcf8d682016e9 kdiff3-0.9.95.tar.gz
bf4bc8cc7bb4d8aae464c9551a76cdd5 KDiff3Setup_0.9.95.exe



Cheers,
Joachim
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.95 released

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

Hi,

Changelog:

Version 0.9.95 - 2009/03/03
===========================
- Show line end style for each file.
- Updated message translations.
- Fixed permissions when writing executable file. (Un*x only)
- Fixed IgnorableCmdLineOptions (important for SVNs '-u'-option)
- Directory merge: Error when either B or C is changed and the other is 
deleted. (User choice required.)
- Qt-only Un*x-version looks for translations in 
/usr/share/locale/<lang>/LC_MESSAGES/kdiff3.qm
  (for Debian, by Eike Sauer)
- New script: po/create_qm_files: To create and install translations for Qt-
only version.

MD5 sums:
33840c3b8a3d1acfd2fdcf8d682016e9  kdiff3-0.9.95.tar.gz
bf4bc8cc7bb4d8aae464c9551a76cdd5  KDiff3Setup_0.9.95.exe

Cheers,
Joachim

Re: [Kdiff3-user] Request to make a change in functionality an option

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

Upon review, I think what a merge program should do in this case is at best undefined.   For some people performing the merge is correct and for others performing the copy is correct.  That is why I was requesting an option setting.  Also for us, performing a manual per-file operation is not practical, as we may have 100's of modules in this same mode.

As of right now, this is not a big issue, as we have changed our internals processing to better handle this situation.

From: Joachim Eibl [mailto:joa...@gm...]
Sent: Sunday, February 22, 2009 7:47 AM
To: kdi...@li...
Subject: Re: [Kdiff3-user] Request to make a change in functionality an option

Hi David,



> Version 0.9.94 - 2009/01/17
> ===========================
> - Directory merge: Default op for change in either B or C and delete in the
> other is now merge (previously copy).
>
> This has turned out to be an issue for one of our processes, as we were
> relying on the copy function in this case. Can this change in
> functionality be made into a controllable option?



I see.



I tried to solve this issue:
https://sourceforge.net/tracker/index.php?func=detail&aid=2017308&group_id=58666&atid=488548



Obviously I underestimated possible problems.



Would it improve the situation, if KDiff3 would set an error for such a file, so that when the user starts the merge then she/he will be warned and the merge would not start until the user specified what operation would be preferred?



Only if this is not sufficient, then I could also add an option.



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

Re: [Kdiff3-user] Request to make a change in functionality an option

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

Hi David,

> Version 0.9.94 - 2009/01/17
> ===========================
> - Directory merge: Default op for change in either B or C and delete in the
> other is now merge (previously copy).
>
> This has turned out to be an issue for one of our processes, as we were
> relying on the copy function in this case.   Can this change in
> functionality be made into a controllable option?

I see.

I tried to solve this issue:
https://sourceforge.net/tracker/index.php?func=detail&aid=2017308&group_id=58666&atid=488548

Obviously I underestimated possible problems.

Would it improve the situation, if KDiff3 would set an error for such a file, 
so that when the user starts the merge then she/he will be warned and the 
merge would not start until the user specified what operation would be 
preferred?

Only if this is not sufficient, then I could also add an option.

Joachim

Re: [Kdiff3-user] kdiff3 crash

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

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

Hi Neal,

I couldn't reproduce on OpenSuse11.1-x86-32 bit.
I also installed OpenSuse11.1-64 bit and tried it and again couldn't reproduce 
the crash. (Setting up the new system took quite a while, that's why I'm so 
late in answering.)

The stack you sent doesn't show me where the problem was. (I can only see 
KDiff3 is exiting, but not why.)
It might also be a problem in the KIO-system of KDE4. Does opening these files 
via konqueror work?

If the problem is KDiff3-specific: Could you please start KDiff3 in a debugger 
(gdb or kdbg) and try to give me more information?

Joachim

[Kdiff3-user] Request to make a change in functionality an option

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

In the .94 release of kdiff3, the following change was implemented:

Version 0.9.94 - 2009/01/17
===========================
- Directory merge: Default op for change in either B or C and delete in the other is now merge (previously copy).

This has turned out to be an issue for one of our processes, as we were relying on the copy function in this case.   Can this change in functionality be made into a controllable option?

David Klaus
Software Engineer - Product Development
Symitar, A Jack Henry & Associates Company
8985 Balboa Ave
San Diego, CA  92123
dk...@sy...<mailto: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.

Re: [Kdiff3-user] BOM mark

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

>> - For some reason KDiff3 converts files from DOS CRLF to Unix LF format,
>> even though neither input file has Unix format.
>>     
>
> Could you please give me more details:
> - What's the setting for line endings in the Diff-settings tab?
>   
I found the setting in the Editor tab. The box was empty (nothing was 
selected?). Now I chose Automatic. I will get back to you if the proplem 
still persist.

Som-Som