kdiff3-user — User questions about KDiff3.

[Kdiff3-user] save all tabs at once?

[Robert O. <phi...@ya...>]

Hi -

I do a lot of screen captures so I wonder if there is
a feature 
that allows bulk save of all the captures with a base
filename and simply appending an index to it.    

What I'm doing now is OK but I'm idividually prompted
for a filename for each capture. 

Is there a feature that allows one to save all tabs at
once?

Thanks.
 


		
__________________________________ 
Yahoo! FareChase: Search multiple travel sites in one click.
http://farechase.yahoo.com

Re: [Kdiff3-user] --auto command line option

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

Jeanson, Marc wrote:
> HI,
> 
>  
> 
> I’m currently using Kdiff3 (it’s fantastic) to do a 3 way merge via 
> another application that batches up the merges. I call kdiff3 like this:
> 
> Kdiff3 test1.cpp test2.cpp test3.cpp –o output.cpp –auto
> 
>  
> 
> Reading the help, it says that –auto should display No GUI if all 
> conflicts are auto-solvable. (Needs -o file). When I use this option it 
> does automatically merge the file, but it flashes the Kdiff3 UI briefly 
> while it does the merge. Now this isn’t bad if I’m only merging once, 
> but because I’m batching up several merges in a row I’d like the merge 
> to occur silently. Is there anyway to do this? I’m guessing no, but I 
> figured I’d try anyway.
> 
>  
> 
> I’m using version 0.9.86 on windows.
> 
>  
> 
> Thanks in advance.
> 

Try
start /min /wait Kdiff3 test1.cpp test2.cpp test3.cpp –o output.cpp –auto

It'll still create a taskbar icon but it will start minimized at least. 
(Haven't tried but that should do it).

M-A

[Kdiff3-user] --auto command line option

[Jeanson, M. <Mar...@na...>]

HI,

=20

I'm currently using Kdiff3 (it's fantastic) to do a 3 way merge via
another application that batches up the merges. I call kdiff3 like this:

Kdiff3 test1.cpp test2.cpp test3.cpp -o output.cpp -auto

=20

Reading the help, it says that -auto should display No GUI if all
conflicts are auto-solvable. (Needs -o file). When I use this option it
does automatically merge the file, but it flashes the Kdiff3 UI briefly
while it does the merge. Now this isn't bad if I'm only merging once,
but because I'm batching up several merges in a row I'd like the merge
to occur silently. Is there anyway to do this? I'm guessing no, but I
figured I'd try anyway.

=20

I'm using version 0.9.86 on windows.=20

=20

Thanks in advance.

Re: [Kdiff3-user] Symbols Are Stipped Out During Merge

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

Joachim Eibl wrote:
> Am Montag, 17. Oktober 2005 19:54 schrieb Matus Lipka:
> 
>>Joachim,
>>
>>Are you using MBCS? From my humble knowledge of multibyte character
>>encodings, I was under the impression that UNICODE is always 2 bytes per
>>character. So once a file is detected as being in UNICODE format, *all*
>>characters are interpreted as 2 bytes. If not, then all characters are 1
>>byte, and the ° and likewise characters are never interpreted as mutibyte.
>>
>>These kind of encodings shouldn't be mixed together in a single file,
>>unless something weird like MBCS is used (which could be a non-default
>>option in KDiff).
>>
>>Does this make sense?
>>
>>Cheers,
>>
>>Matus
> 
> 
> Hi Matus,
> 
> The term "Unicode" covers both. You might want to read 
> http://en.wikipedia.org/wiki/Unicode
> 
> Since the name "Unicode" doesn't stand for any specific encoding the names 
> UTF-8 or UCS-2 are used to be more precise.
> 
> In any case UTF-8 (which is an 8-bit, variable-width encoding) is becoming 
> very popular and is often the default (especially on Linux-machines).
> 
> But KDiff3 should try to honor the default setting for every individual 
> machine.
> 
> Cheers,
> Joachim
> 

FYI,

Microsoft somewhat mixed up people with their nomenclature. Unicode is 
NOT an encoding, as Joachim previously said. I wouldn't blame Microsoft 
has the encoding standards have been relatively slow to be standardized.

Windows uses UTF-16 internally. It used to use UCS-2 in NT 3.x but it is 
now deprecated.
http://www.faqs.org/rfcs/rfc2279.html
http://www.faqs.org/rfcs/rfc2781.html

Windows is the only OS that use UTF-16 (known to me), every other uses 
UTF-8 because it is simpler for backward compatibility.

MBCS is a generic term because in the past, there has been other 
encoding than UTF-X that shouldn't be used anymore.

UTF-8/UTF-16 can be detected by looking for the BOM (BYTE ORDER MARK). 
But UTF-8 can be the default encoding nevertheless.

By the way, if a invalid character is read, this is probably normal that 
is it removed by the UTF-8 decoder. But it would be better than kdiff3 
detect this and warns the user. Just a thought.

M-A

Re: [Kdiff3-user] win32 - initial window size

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

Hi Tim,

Am Dienstag, 18. Oktober 2005 11:32 schrieb Tim:
> I'm posting here because the website asks for suggestions to be posted
> here. I use KDiff3 on a daily basis combined with TortoiseSVN.

That's nice to hear :-)

> I find the initial size of the KDiff window quite a nuisance, as it
> appears to be maximized, but actually is just stretched to fit the screen.
> I would much prefer if the program started with a normal window size,
> then I could drag it into the screen I want then maximize it there.

KDiff3 saves the size and position where it was placed when closing and 
restores these on restart. But when you maximize the window then this special 
state isn't saved. (Also because this "Maximized" state is not available on 
most Linux-windowmanagers.) But we could also try to save this "Maximized" 
state.

As for screens: You seem to have more than one. So far I didn't consider this. 
It might be possible to also save the screen where KDiff3 should be restored. 
Would this be wanted?

Your idea to start with a "normal" (not fullscreen?) size, probably wouldn't 
suit other users.

Cheers,
Joachim

[Kdiff3-user] win32 - initial window size

[Tim <ti...@ti...>]

Hello,

I'm posting here because the website asks for suggestions to be posted here.
I use KDiff3 on a daily basis combined with TortoiseSVN.

I find the initial size of the KDiff window quite a nuisance, as it 
appears to be maximized, but actually is just stretched to fit the screen.
I would much prefer if the program started with a normal window size, 
then I could drag it into the screen I want then maximize it there.

Not a big deal, but just a thought.

I'd be happy to contribute a patch to this but don't really know where 
to start. Any tips appreciated.

Tim Abell


-- 
Get Thunderbird <http://www.mozilla.org/products/thunderbird/> 	CACert - 
free certificates <http://www.cacert.org/>


This message is signed with a digital from CACert.org, if your email 
client does not show the message as signed then you may not have the 
root certificate installed, or your mail client may not be able to read 
digital signatures. Try thunderbird instead.

Re: [Kdiff3-user] Symbols Are Stipped Out During Merge

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

Am Montag, 17. Oktober 2005 19:54 schrieb Matus Lipka:
> Joachim,
>
> Are you using MBCS? From my humble knowledge of multibyte character
> encodings, I was under the impression that UNICODE is always 2 bytes per
> character. So once a file is detected as being in UNICODE format, *all*
> characters are interpreted as 2 bytes. If not, then all characters are 1
> byte, and the =C2=B0 and likewise characters are never interpreted as mut=
ibyte.
>
> These kind of encodings shouldn't be mixed together in a single file,
> unless something weird like MBCS is used (which could be a non-default
> option in KDiff).
>
> Does this make sense?
>
> Cheers,
>
> Matus

Hi Matus,

The term "Unicode" covers both. You might want to read=20
http://en.wikipedia.org/wiki/Unicode

Since the name "Unicode" doesn't stand for any specific encoding the names=
=20
UTF-8 or UCS-2 are used to be more precise.

In any case UTF-8 (which is an 8-bit, variable-width encoding) is becoming=
=20
very popular and is often the default (especially on Linux-machines).

But KDiff3 should try to honor the default setting for every individual=20
machine.

Cheers,
Joachim

Re: [Kdiff3-user] Symbols Are Stipped Out During Merge

[Matus L. <mat...@ko...>]

Joachim,

Are you using MBCS? From my humble knowledge of multibyte character=20
encodings, I was under the impression that UNICODE is always 2 bytes per=20
character. So once a file is detected as being in UNICODE format, *all*=20
characters are interpreted as 2 bytes. If not, then all characters are 1=20
byte, and the =B0 and likewise characters are never interpreted as mutibyte.

These kind of encodings shouldn't be mixed together in a single file,=20
unless something weird like MBCS is used (which could be a non-default=20
option in KDiff).

Does this make sense?

Cheers,

Matus

Re: [Kdiff3-user] Symbols Are Stipped Out During Merge

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

...
[Correction:]
The characters above code 128 might start a multibyte character which means 
that several bytes are interpreted as one character. This special character, 
should then be written back as a multibyte character, so nothing should be 
lost?
...

Re: [Kdiff3-user] Symbols Are Stipped Out During Merge

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

Am Freitag, 14. Oktober 2005 10:54 schrieb Lieven Govaerts:
> Would it be possible to automatically detect this from the type of input
> files? I've seen this in other tools, and it would help users using
> multiple encodings.
>
> Just a quick google scan turns up this page:
> http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/363841
>
> Lieven.
>


Hi Lieven,

Yes, I suppose that some kind of autodetection would be helpful. But note t=
hat=20
there are some problems too. For example if all input files use some encodi=
ng=20
and while editing some characters are inserted that are not supported by th=
at=20
encoding. Before saving this would have to be detected and the user must be=
=20
informed. Similar if different encodings are used in the merged input files.

But I will investigate ...

Cheers,
Joachim

> Quoting Joachim Eibl <joa...@gm...>:
> > Am Mittwoch, 12. Oktober 2005 20:54 schrieb Matus Lipka:
> > > I have found that 0.9.88 strips out characters such as =C2=B5 or =C2=
=B0 during
> > > merge. Also, you cannot even see them when you do a simple diff. 0.9.=
86
> > > doesn't have this problem.
> > >
> > > Thanks,
> > >
> > > Matus
> >
> > Hi Matus,
> >
> > Version 0.9.88 supports several encodings and the preselected choice is
> > UTF-8.
> > Please enter the KDiff3-options dialog and select the regional-settings
> > tab and change the encoding.
> > The local encoding is shown at the top as a hint. Probably it's best for
> > you to select that.
> > (If you still sometimes use an older version <=3D0.9.86 then you might =
have
> > to reselect this every time when switching back to a newer version.)
> >
> > The next version of KDiff3 will preselect the local encoding for new
> > KDiff3 users.
> >
> > Cheers,
> > Joachim
> >
> >
> > -------------------------------------------------------
> > This SF.Net email is sponsored by:
> > Power Architecture Resource Center: Free content, downloads, discussion=
s,
> > and more. http://solutions.newsforge.com/ibmarch.tmpl
> > _______________________________________________
> > Kdiff3-user mailing list
> > Kdi...@li...
> > https://lists.sourceforge.net/lists/listinfo/kdiff3-user
>
> ----------------------------------------------------------------
> This message was sent using IMP, the Internet Messaging Program.
>
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by:
> Power Architecture Resource Center: Free content, downloads, discussions,
> and more. http://solutions.newsforge.com/ibmarch.tmpl
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

Re: [Kdiff3-user] Symbols Are Stipped Out During Merge

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

Am Freitag, 14. Oktober 2005 19:41 schrieb Matus Lipka:
> Why would it strip any of these characters anyway? Regardless of the
> encoding, it should keep any special characters as is if it doesn't
> recognize them, no?

Short answer: I also would have expected that no characters are lost.
But:
The problem is that UTF-8 is an encoding that uses one byte per character f=
or=20
the lower 128-ASCII characters only. The characters above code 128 might=20
start a multibyte character which means that several bytes are encoded into=
=20
one byte. These bytes are turned into one special character, but should the=
n=20
be written back as a multibyte character, so nothing should be lost? This=20
depends on details that I don't know. What if the special character appears=
=20
just before the end of a line/file? Will it be ignored then? What if the=20
encoder doesn't know about that special character-code? I use QTextCodec, b=
ut=20
I don't know its inner workings.

Cheers,
Joachim

> Cheers,
>
> Matus
>
>
>
>
>
> Joachim Eibl <joa...@gm...>
>
> 14/10/2005 00:37
> 14/10/2005 09:37 ZE2
> Please respond to joachim.eibl
>
>         To:     kdi...@li...
>         cc:     Matus Lipka <mat...@ko...>
>         Subject:        Re: [Kdiff3-user] Symbols Are Stipped Out During
> Merge
>
> Am Mittwoch, 12. Oktober 2005 20:54 schrieb Matus Lipka:
> > I have found that 0.9.88 strips out characters such as =C2=B5 or =C2=B0=
 during
> > merge. Also, you cannot even see them when you do a simple diff. 0.9.86
> > doesn't have this problem.
> >
> > Thanks,
> >
> > Matus
>
> Hi Matus,
>
> Version 0.9.88 supports several encodings and the preselected choice is
> UTF-8.
> Please enter the KDiff3-options dialog and select the regional-settings
> tab
> and change the encoding.
> The local encoding is shown at the top as a hint. Probably it's best for
> you
> to select that.
> (If you still sometimes use an older version <=3D0.9.86 then you might ha=
ve
> to
> reselect this every time when switching back to a newer version.)
>
> The next version of KDiff3 will preselect the local encoding for new
> KDiff3
> users.
>
> Cheers,
> Joachim

Re: [Kdiff3-user] Symbols Are Stipped Out During Merge

[Matus L. <mat...@ko...>]

Thanks for the reply, Joachim. I will use 0.9.96 until you fix these=20
defaults; I don't want any less experienced developers (or anyone else by=20
mistake) to use an incorrect encoding during merge and have all the=20
characters stripped again from the code.

Why would it strip any of these characters anyway? Regardless of the=20
encoding, it should keep any special characters as is if it doesn't=20
recognize them, no?

Cheers,

Matus





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

14/10/2005 00:37
14/10/2005 09:37 ZE2
Please respond to joachim.eibl
=20
        To:     kdi...@li...
        cc:     Matus Lipka <mat...@ko...>
        Subject:        Re: [Kdiff3-user] Symbols Are Stipped Out During=20
Merge


Am Mittwoch, 12. Oktober 2005 20:54 schrieb Matus Lipka:
> I have found that 0.9.88 strips out characters such as =B5 or =B0 during
> merge. Also, you cannot even see them when you do a simple diff. 0.9.86
> doesn't have this problem.
>
> Thanks,
>
> Matus

Hi Matus,

Version 0.9.88 supports several encodings and the preselected choice is=20
UTF-8.
Please enter the KDiff3-options dialog and select the regional-settings=20
tab=20
and change the encoding.
The local encoding is shown at the top as a hint. Probably it's best for=20
you=20
to select that.
(If you still sometimes use an older version <=3D0.9.86 then you might have=
=20
to=20
reselect this every time when switching back to a newer version.)

The next version of KDiff3 will preselect the local encoding for new=20
KDiff3=20
users.

Cheers,
Joachim

Re: [Kdiff3-user] Symbols Are Stipped Out During Merge

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

Would it be possible to automatically detect this from the type of input
files? I've seen this in other tools, and it would help users using
multiple encodings.

Just a quick google scan turns up this page:
http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/363841

Lieven.

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

> Am Mittwoch, 12. Oktober 2005 20:54 schrieb Matus Lipka:
> > I have found that 0.9.88 strips out characters such as µ or ° during
> > merge. Also, you cannot even see them when you do a simple diff. 0.9.86
> > doesn't have this problem.
> >
> > Thanks,
> >
> > Matus
>
> Hi Matus,
>
> Version 0.9.88 supports several encodings and the preselected choice is
> UTF-8.
> Please enter the KDiff3-options dialog and select the regional-settings tab
> and change the encoding.
> The local encoding is shown at the top as a hint. Probably it's best for you
> to select that.
> (If you still sometimes use an older version <=0.9.86 then you might have to
> reselect this every time when switching back to a newer version.)
>
> The next version of KDiff3 will preselect the local encoding for new KDiff3
> users.
>
> Cheers,
> Joachim
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by:
> Power Architecture Resource Center: Free content, downloads, discussions,
> and more. http://solutions.newsforge.com/ibmarch.tmpl
> _______________________________________________
> 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] Symbols Are Stipped Out During Merge

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

Am Mittwoch, 12. Oktober 2005 20:54 schrieb Matus Lipka:
> I have found that 0.9.88 strips out characters such as =C2=B5 or =C2=B0 d=
uring
> merge. Also, you cannot even see them when you do a simple diff. 0.9.86
> doesn't have this problem.
>
> Thanks,
>
> Matus

Hi Matus,

Version 0.9.88 supports several encodings and the preselected choice is UTF=
=2D8.
Please enter the KDiff3-options dialog and select the regional-settings tab=
=20
and change the encoding.
The local encoding is shown at the top as a hint. Probably it's best for yo=
u=20
to select that.
(If you still sometimes use an older version <=3D0.9.86 then you might have=
 to=20
reselect this every time when switching back to a newer version.)

The next version of KDiff3 will preselect the local encoding for new KDiff3=
=20
users.

Cheers,
Joachim

Re: [Kdiff3-user] Patch for new feature: goto next/previous delta honors overview mode

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

I'm sorry it took me so long to reply, I was quite busy lately.

Joachim Eibl wrote:
> Thanks for your patch. This clarified things for me, because I wasn't exactly 
> sure what you needed.
> 
> I'll include it in the next release.

Great!

> 
> I should also mention that your wish "manually align the lines"  is 
> implemented. (But it was quite difficult.)

That's cool! I knew it was difficult, that's why I didn't expect it to 
see it implemented soon ;) Thanks!

> 
> But I haven't done anything about "Postprocessor commands". This should be 
> easier. Do you want to give it a shot?

I'll try, but I can't promise anything, as I have little spare time and 
I'm using almost all of it trying to setup a MythTV-based PVR.

I'll take a look at it this weekend and see what I can do...

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

[Kdiff3-user] Symbols Are Stipped Out During Merge

[Matus L. <mat...@ko...>]

I have found that 0.9.88 strips out characters such as =B5 or =B0 during=20
merge. Also, you cannot even see them when you do a simple diff. 0.9.86=20
doesn't have this problem.

Thanks,

Matus

Re: [Kdiff3-user] Patch for new feature: goto next/previous delta honors overview mode

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

Hi Vladan,

Thanks for your patch. This clarified things for me, because I wasn't exactly 
sure what you needed.

I'll include it in the next release.

I should also mention that your wish "manually align the lines"  is 
implemented. (But it was quite difficult.)

But I haven't done anything about "Postprocessor commands". This should be 
easier. Do you want to give it a shot?

Cheers,
Joachim



Am Freitag, 7. Oktober 2005 18:04 schrieb Vladan Bato:
> A while back I wrote with a list of features I would like to see in
>
> KDiff3. Among them was this one:
> > 2) Make the 'Goto next delta' button configurable when doing a 3-way
> > merge of a file. I would like to be able to skip certain types of
> > differences.
> > For example, I often have to merge differences between A and B into C.
> > In this case I am not interested in the deltas where A and B are equal
> > and C is different (where A and B have purple color).
>
> Today I noticed for the first time the overview options in the Diffview
> menu. When set to "A vs. B overview" I get exactly what I want in the
> second overview column.
>
> The problem is that the "Goto Next Delta" and "Goto Previous Delta"
> buttons (and keys) still step through all the deltas, not just the
> "interesting" ones.
>
> Thus I modified KDiff3 so it honors the overview mode when using the
> "goto next/previous delta" commands.
>
> Since there's no "kdiff3-devel" mailing list, I'm sending the patch
> here. Attahced you'll find a patch against the latest release (0.9.88).
>
>
> ====
>
> A few words about the implementation (this is meant for Joachim):
>
> In order to implement it I had to make a design choice:
>
> The code to skip "uninteresting" deltas had to go into
> MergeResultWindow::go().
>
> The problem was: how do I get the current overview mode?
> The overview mode is stored inside the Overview widget and, as far as I
> can tell it is not accessible from MergeResultWindow.
>
> I could think of three ways to do it:
> 1) Place the current overview mode in a globally accessible place
> 2) Make it possible for MergeResultWindow to access the Overview widget.
> 3) Keep a copy of the overview mode in MergeResultWindow, and set it
> from KDiff3App at the same time as the one in m_pOverview.
>
> I chose to implement the third option as it was the easiest. I didn't
> know how to do the other two as I don't know enough about the program's
> structure.
>
> I hope you find it useful and include it in the next release.
>
> And thanks for the great work you did so far!

[Kdiff3-user] Patch for new feature: goto next/previous delta honors overview mode

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

A while back I wrote with a list of features I would like to see in 
KDiff3. Among them was this one:

> 2) Make the 'Goto next delta' button configurable when doing a 3-way 
> merge of a file. I would like to be able to skip certain types of 
> differences.
> For example, I often have to merge differences between A and B into C. 
> In this case I am not interested in the deltas where A and B are equal 
> and C is different (where A and B have purple color).

Today I noticed for the first time the overview options in the Diffview 
menu. When set to "A vs. B overview" I get exactly what I want in the 
second overview column.

The problem is that the "Goto Next Delta" and "Goto Previous Delta" 
buttons (and keys) still step through all the deltas, not just the 
"interesting" ones.

Thus I modified KDiff3 so it honors the overview mode when using the 
"goto next/previous delta" commands.

Since there's no "kdiff3-devel" mailing list, I'm sending the patch 
here. Attahced you'll find a patch against the latest release (0.9.88).


====

A few words about the implementation (this is meant for Joachim):

In order to implement it I had to make a design choice:

The code to skip "uninteresting" deltas had to go into 
MergeResultWindow::go().

The problem was: how do I get the current overview mode?
The overview mode is stored inside the Overview widget and, as far as I 
can tell it is not accessible from MergeResultWindow.

I could think of three ways to do it:
1) Place the current overview mode in a globally accessible place
2) Make it possible for MergeResultWindow to access the Overview widget.
3) Keep a copy of the overview mode in MergeResultWindow, and set it 
from KDiff3App at the same time as the one in m_pOverview.

I chose to implement the third option as it was the easiest. I didn't 
know how to do the other two as I don't know enough about the program's 
structure.

I hope you find it useful and include it in the next release.

And thanks for the great work you did so far!

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

[Kdiff3-user] Message

[Nila <in...@sk...>]

Hello!

We are glad to inform you, that your link to site http://kdiff3.sourceforge.net/ was modifyed. There are new attributes of your link:

Title: KDiff3
Description: Compares and merges 2 or 3 files or directories. The file diff shows changes within each line. For Unix and for Windows. Source available under GPL.
Email: kdi...@li...
Rank: 0

You can browse your link here http://www.skalinks.com/dir/file-management/file-comparison/
Thank you
SkaLinks.com Administration team
in...@sk...

If you didn't place reciprocal link(s) to SkaLinks.com yet, please use the following information:
---------
URL: http://www.skalinks.com/
Title: SkaLinks.com  
Description: Powerful Link Management software written in PHP. Search engines friendly structure, advanced advertisement system, advanced multiple editors tools. Broken and reciprocal links check. Absolutely FREE link exchange software.

or put html link code:
<a href="http://www.skalinks.com/">SkaLinks.com</a>
---------
This will help your link stay in our directory permanently.

All the links in our directory are direct, so they will improve your link popularity
and Google PageRank.

We truly hope to send many visitors your way.

Thank you,
SkaLinks.com administration team
in...@sk...

Re: [Kdiff3-user] Fwd: Is this project still active?

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

Joachim Eibl wrote:
> The project is not dead. I'm even working on bugfixes and new features 
> currently. But this is a spare time project and feature requests are coming 
> in much faster than I can implement them. Patches on the other hand are very 
> seldom. 

Hi,
I too have some feature requests for you :-)

But first, let me say that I rally appreciate the work you have done on 
kdiff3. It is the best 3-way merge tool around and it has been a real 
time saver for me.

Here are a few features that would be very useful to me:

1) Postprocessor commands:
Right now it's possible to pre-process files before merging them (with a 
warning), but it's impossible to post-process the result.
Specifically I often have to merge Delphi 4 sources, which uses binary 
files for describing forms (.dfm files). These files can be converted 
to/from text with external tools, but it would be nice if I could 
convert them to text before merging and back to binary when writing the 
result.

2) Make the 'Goto next delta' button configurable when doing a 3-way 
merge of a file. I would like to be able to skip certain types of 
differences.
For example, I often have to merge differences between A and B into C. 
In this case I am not interested in the deltas where A and B are equal 
and C is different (where A and B have purple color).

3) The possibility to manually align the lines. Sometimes the line 
matching algorithm aligns the files badly at certain points. I would 
like to be able to tell it which lines should be aligned.

> Please don't be too disappointed if your particulary needed features didn't 
> make it into the next version. Probably available this autumn.

I won't. If the features were *that* important, I would have implemented 
them myself ;-)

Keep up the good work and thanks again.

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

[Kdiff3-user] Fwd: Is this project still active?

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

Hi everybody interested in KDiff3,

I recently received the question if the project is still under active 
development?

Answer: Yes, but not as fast as I would like.

The project is not dead. I'm even working on bugfixes and new features 
currently. But this is a spare time project and feature requests are coming 
in much faster than I can implement them. Patches on the other hand are very 
seldom. 

One reason probably is, that there are many users under Windows
who couldn't participate in development because the Qt-library
version 3 wasn't available as open source by Trolltech. This has changed with 
Qt4 and my next version of KDiff3 will be published in two versions (one
based on Qt3 and and the other based on Qt4). 
 
If you have a patch, please send it. If it's a new feature, make sure it's 
also available on the GUI and test it well. I might reject half thought 
through implementations because of the amount of work that's left
for me. (e.g. many people use KDiff3 only for comparing two files and
don't consider merging or three files or directories.)

Please don't be too disappointed if your particulary needed features didn't 
make it into the next version. Probably available this autumn.

Cheers,
Joachim

Re: [Kdiff3-user] feature request show/hide identical files

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

Hi John,

I'm late in answering because of my holiday.
I agree with the usefulness of your suggestions and have them on my todo-list.

Cheers,
Joachim


Am Mittwoch, 7. September 2005 14:46 schrieb John Mullin:
> Hi,
>
> I just started using Kdiff3 and it is a fabulous tool. It has most
> of the features I use in a diff tool, it's very fast by comparison
> to others I've used and I like its interface too. Good work.
>
> After using it for a short time, I do have a couple of suggestions,
> some of which I've seen in other programs, some of which I haven't...
>
> 1) A feature to dynamically customise what files are shown in the
>    directory tree (without a rescan) would help to reduce clutter.
>    I'll try to describe what I mean...
>    I would suggest categorising or adding attributes to each line
>    in the view (both files and subdirectories containing files) for
>
>    "Identical",
>    "Exists in A only",
>    "Exists in B only",
>    "Exists in C only",
>    "differences - A is newer",
>    "differences - B is newer",
>    "differences - C is newer",
>    "different in whitespace only"
>    "Selected" (*see below)
>
>    and then allowing the user to select which items to show
>    maybe using a menu or dialog box with toggle option for
>    each attribute (some options override others, e.g.
>    "Any Differences" obviously overrides "Difference (A is newer)")
>
>    [Show/Hide/Ignore] Identical Files
>    [Show/Hide/Ignore] Files in A only
>    [Show/Hide/Ignore] Files in B only
>    [Show/Hide/Ignore] Files in C only
>    [Show/Hide/Ignore] Any Differences
>    [Show/Hide/Ignore] Differences (A is newer)
>    [Show/Hide/Ignore] Differences (B is newer)
>    [Show/Hide/Ignore] Differences (C is newer)
>    [Show/Hide/Ignore] Selected Files
>    [Show/Hide/Ignore] Files different in whitespace only
>    [Show/Hide/Ignore] Files with conflicts (might be tricky???)
>
>    This would then allow the program to traverse its directory
>    tree and remove files and entire subdirectories from its view
>    if they don't contain files that the user currently cares about.
>
> 2) Related to the above suggestion of dynamically hiding entries
>    is the idea of "selecting" interesting or uninteresting files.
>    This could be done by addng a column with a tick box to the
>    tree view and adding an attribute to each line (file or directory).
>    A menu/dialog could be used to manage selections
>    (Select all, unselect all, toggle selection, select by regular
> expression...).
>    This would allow users to concentrate on particular files without
>    a potentially lenghty rescan.
>
> 3) A feature to use an external editor (or indeed any external program).
>    This has been described before but it's a useful feature. A slight
>    extension of this feature is the ability to pass information from
>    Kdiff to the program using substitution. Substition like the following
>    mightbe useful (in A, B, C varities)...
>    $FULLNAME_A (/my/path/myfile.txt)
>    $PATH_A (/my/path)
>    $FILENAME_A (myfile.txt)
>    $BASENAME_A (myfile)
>    $EXT_A (.txt)
>    $LINENUMBER_A (123)
>    $DRIVE_A (c:)  (this might be useful in MSWindows)
>
> 4) Find files
>    A method for finding files and automatically expanding the tree to
>    highlight it would be useful.
>
>    A simple "Find File" dialog is one way to go, however,
>    if you've ever used the music player foobar2000, their
>    "playlist search" works for very well for finding single files in
>    huge playlists. It works by opening a dialog box containing a huge list
>    of all files and it prunes out irrelevalnt files in the dialog box
>    dynamically as you type the string you're searching for.
>    You can then click the particular file you're looking for from a
>    small list.
>
>
> Well that's my two cents, if you've any thoughts on those ideas or if I
> haven't been clear enough, let me know. Don't get me wrong, KDiff3 is a
> great
> tool and these are just a few suggestions...
>
> Regards,
> John Mullin
>
>
> -------------------------------------------------------
> SF.Net email is Sponsored by the Better Software Conference & EXPO
> September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
> Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
> Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] feature request show/hide identical files

[John M. <joh...@ho...>]

Hi,

I just started using Kdiff3 and it is a fabulous tool. It has most
of the features I use in a diff tool, it's very fast by comparison
to others I've used and I like its interface too. Good work.

After using it for a short time, I do have a couple of suggestions,
some of which I've seen in other programs, some of which I haven't...

1) A feature to dynamically customise what files are shown in the 
   directory tree (without a rescan) would help to reduce clutter.
   I'll try to describe what I mean...
   I would suggest categorising or adding attributes to each line 
   in the view (both files and subdirectories containing files) for 

   "Identical",
   "Exists in A only",
   "Exists in B only", 
   "Exists in C only",
   "differences - A is newer",
   "differences - B is newer",
   "differences - C is newer",
   "different in whitespace only"
   "Selected" (*see below)
   
   and then allowing the user to select which items to show
   maybe using a menu or dialog box with toggle option for 
   each attribute (some options override others, e.g. 
   "Any Differences" obviously overrides "Difference (A is newer)")

   [Show/Hide/Ignore] Identical Files
   [Show/Hide/Ignore] Files in A only
   [Show/Hide/Ignore] Files in B only
   [Show/Hide/Ignore] Files in C only
   [Show/Hide/Ignore] Any Differences
   [Show/Hide/Ignore] Differences (A is newer)
   [Show/Hide/Ignore] Differences (B is newer)
   [Show/Hide/Ignore] Differences (C is newer)
   [Show/Hide/Ignore] Selected Files
   [Show/Hide/Ignore] Files different in whitespace only
   [Show/Hide/Ignore] Files with conflicts (might be tricky???)

   This would then allow the program to traverse its directory 
   tree and remove files and entire subdirectories from its view 
   if they don't contain files that the user currently cares about.

2) Related to the above suggestion of dynamically hiding entries
   is the idea of "selecting" interesting or uninteresting files. 
   This could be done by addng a column with a tick box to the 
   tree view and adding an attribute to each line (file or directory). 
   A menu/dialog could be used to manage selections 
   (Select all, unselect all, toggle selection, select by regular
expression...).
   This would allow users to concentrate on particular files without
   a potentially lenghty rescan.

3) A feature to use an external editor (or indeed any external program).
   This has been described before but it's a useful feature. A slight 
   extension of this feature is the ability to pass information from 
   Kdiff to the program using substitution. Substition like the following
   mightbe useful (in A, B, C varities)... 
   $FULLNAME_A (/my/path/myfile.txt)
   $PATH_A (/my/path)
   $FILENAME_A (myfile.txt)
   $BASENAME_A (myfile)
   $EXT_A (.txt)
   $LINENUMBER_A (123)
   $DRIVE_A (c:)  (this might be useful in MSWindows)

4) Find files
   A method for finding files and automatically expanding the tree to 
   highlight it would be useful.

   A simple "Find File" dialog is one way to go, however, 
   if you've ever used the music player foobar2000, their 
   "playlist search" works for very well for finding single files in 
   huge playlists. It works by opening a dialog box containing a huge list 
   of all files and it prunes out irrelevalnt files in the dialog box 
   dynamically as you type the string you're searching for.
   You can then click the particular file you're looking for from a 
   small list.
   

Well that's my two cents, if you've any thoughts on those ideas or if I
haven't been clear enough, let me know. Don't get me wrong, KDiff3 is a
great
tool and these are just a few suggestions...

Regards,
John Mullin

[Kdiff3-user] Message

[Nila <in...@sk...>]

Hello!

We are glad to inform you, that your link to site http://kdiff3.sourceforge.net/ was modifyed. There are new attributes of your link:

Title: KDiff3
Description: Compares and merges 2 or 3 files or directories. The file diff shows changes within each line. For Unix and for Windows. Source available under GPL.
Email: kdi...@li...
Rank: 0

You can browse your link here http://www.skalinks.com/dir/file-management/file-comparison/
Thank you
SkaLinks.com Administration team
in...@sk...

If you didn't place reciprocal link(s) to SkaLinks.com yet, please use the following information:
---------
URL: http://www.skalinks.com/
Title: SkaLinks.com  
Description: Powerful Link Management software written in PHP. Search engines friendly structure, advanced advertisement system, advanced multiple editors tools. Broken and reciprocal links check. Absolutely FREE link exchange software.

or put html link code:
<a href="http://www.skalinks.com/">SkaLinks.com</a>
---------
This will help your link stay in our directory permanently.

All the links in our directory are direct, so they will improve your link popularity
and Google PageRank.

We truly hope to send many visitors your way.

Thank you,
SkaLinks.com administration team
in...@sk...

RE: [Kdiff3-user] RFEs

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

Ok so to build it I've got to get QT3.3.4 for windows somehow? I guess =
I'm
better to wait until you put in CVS the support for QT4?

M-A

-----Message d'origine-----
De=A0: kdi...@li...
[mailto:kdi...@li...] De la part de Joachim =
Eibl
Envoy=E9=A0: 24 ao=FBt 2005 15:50
=C0=A0: kdi...@li...
Cc=A0: Marc-Antoine Ruel
Objet=A0: Re: [Kdiff3-user] RFEs

Hi Marc-Antoine,

Am Dienstag, 23. August 2005 19:47 schrieb Marc-Antoine Ruel:
> I just wanted to tell that I added many RFEs but that I will try to
> implement them if my schedule permits me to.

That would be cool.

> The requests 1266400, 1266393 and 1266417 are the one I find the most
> important.

> I'm looking to build kdiff3. I downloaded QT 4.01 open source version =
for
> windows and installed mingw even if you tell in the readme that you =
used
> VC.

I'm working on a KDiff3-port for Qt4. It already works except for some=20
details. But I must still test it under Windows too, then I'll publish =
it.

> I generated the makefile (with qmake) and I saw that it use g++ and =
not
the
> VC's compiler. Maybe it is QT that configured the makefile this way.
Anyway
> I got compile errors if I use the makefile.qt. When I use the
> Makefile.release (generated by qmake), make tells that it is unable to
make
> release\diff.moc.

> I tried with nmake and mingw32-make.
> Should I try with QT 3.xx instead?

Yes. The current KDiff3-version requires Qt3.x (x>=3D2)

Cheers,
Joachim