kdiff3-user — User questions about KDiff3.

Re: [Kdiff3-user] KDiff3 & Statistics?

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

Hi,

Currently only the number differences and conflicts is shown.
But since one difference can span many lines, I suppose this is not what yo=
u=20
want.

Cheers,
Joachim

Am Mittwoch, 28. M=E4rz 2007 16:49 schrieb spencerforhire:
> I was wondering if it's possible to get statistics from KDiff3?  For
> example, the number of characters different between two files, the
> number of lines different between two files, etc.?
>
> Thanks for a great tool!
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share
> your opinions on IT & business topics through brief surveys-and earn cash
> http://www.techsay.com/default.php?page=3Djoin.php&p=3Dsourceforge&CID=3D=
DEVDEV
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

Re: [Kdiff3-user] history merge does not produce output

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

Hi Fabian,

Please remove the leading comment "//" from the regexp. Then it should work=
=20
fine. (It does so on my machine.)

Cheers,
Joachim


Am Mittwoch, 28. M=E4rz 2007 23:59 schrieb Fabian Sturm:
> Hi!
>
> First of all, thanks for this wonderful tool! It really works great and
> saves a lot of time. But unfortunately I have some trouble getting the
> history merge to work.
>
> I try to merge 3 files at once with the history merge.
> But after the merge all the history is deleted and only this line is
>
> left:
>   | /**
>   | @history
>
> C | //  $Log: test.cpp $
> m | //
>
>   | */
>
> My history has this format:
>
> /**
> @history
> //  $Log: test.cpp $
> //
> //     /main/0.0/testbranch/xy/1   27 Oct 2006 10:39:34   sturm
> //  Some comments
> //
> //     /main/0.0/testbranch/3   27 Oct 2006 10:39:34   sturm
> //  Merge from x to y
> //
> //     /main/0.0/testbranch/2   20 Oct 2006 11:15:34   sturm
> //  Add some bugfix...
> //
> */
>
>
> An though I thought the following setting should work. The match tool
> also tells me a correct looking match.
>
> regex:
>
> //\s*/main/(\S+)\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|
> Nov|Dec) ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s
> +(.*)
>
>
> Sort key order: 4,3,2,5,1,6
>
> History merge sorting: yes
>
> Merge vcs history on merge start: yes
>
>
> Any ideas why this produces the empty output?
>
> Thanks a lot, Fabian
>
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share
> your opinions on IT & business topics through brief surveys-and earn cash
> http://www.techsay.com/default.php?page=3Djoin.php&p=3Dsourceforge&CID=3D=
DEVDEV
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

[Kdiff3-user] history merge does not produce output

[Fabian S. <f...@rt...>]

Hi!

First of all, thanks for this wonderful tool! It really works great and
saves a lot of time. But unfortunately I have some trouble getting the
history merge to work.

I try to merge 3 files at once with the history merge.
But after the merge all the history is deleted and only this line is
left:

  | /**
  | @history
C | //  $Log: test.cpp $
m | //
  | */


My history has this format:

/**
@history
//  $Log: test.cpp $
//
//     /main/0.0/testbranch/xy/1   27 Oct 2006 10:39:34   sturm
//  Some comments
//
//     /main/0.0/testbranch/3   27 Oct 2006 10:39:34   sturm
//  Merge from x to y
//
//     /main/0.0/testbranch/2   20 Oct 2006 11:15:34   sturm
//  Add some bugfix...
//
*/


An though I thought the following setting should work. The match tool
also tells me a correct looking match. 

regex:

//\s*/main/(\S+)\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|
Nov|Dec) ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s
+(.*)


Sort key order: 4,3,2,5,1,6

History merge sorting: yes

Merge vcs history on merge start: yes


Any ideas why this produces the empty output?

Thanks a lot, Fabian

Re: [Kdiff3-user] Pre-processing not working on Mac

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

Hi Ed,

I'm glad to hear you were successful with perl instead of sed.

One note about your arguments:
The "i" (from "-pi") means in-place modification, which isn't needed here.
This should be sufficient as preprocessor command:
perl -p -e 's/sti/ew/g'
This will be used like:
cat source | perl -p -e 's/sti/ew/g' >/tmp/tempfile

Use in-place modification when directly modifying files:
e.g.: perl -pi -e 's/sti/ew/g'  testfile

Cheers,
Joachim


Am Mittwoch, 28. M=C3=A4rz 2007 12:26 schrieben Sie:
> Thanks.
>
> I tried some of your suggestions, and interestingly cat worked fine.
> Sed works fine on the commandline but not in the preprocessor.  Using
> full paths doesn't make any difference.
>
> Because of your suggestion about trying cat, I thought of trying
> another way to do the search and replace and a little googling brought
> up this:
>
> perl -pi -e 's/sti/ew/g'
>
> Which works fine and has the expected results, so it must just be some
> weird problem with sed.
>
> Thank you for your suggestions, they really helped.
>
> Ed
>
> On 3/27/07, Joachim Eibl <joa...@gm...> wrote:
> > Hi Ed,
> >
> > I've immediately asked my Mac-"reference user", but so far he hasn't
> > responded.
> >
> > Since I am no Mac-expert I don't know what might be wrong, but here are
> > some hints.
> >
> > Could you please test the normal preprocessor using your command and
> > others. E.g. cat /your/path/some_file_of_yours.txt
> >
> > If this doesn't work please specify full paths:
> > e.g.: /bin/cat /your/path/some_file_of_yours.txt
> >
> > Another thing involved in this command is the temporary directory.
> > The "/tmp"-directory must exist and allow read and write access.
> >
> > Please inform me of the results of your investigation.
> >
> > Cheers,
> > Joachim
> >
> > Am Dienstag, 27. M=C3=A4rz 2007 10:07 schrieben Sie:
> > > I'm perfectly happy to put up with the spam on the list if someone can
> > > help me with my message about pre-processing not working on the Mac.
> > >
> > > Ed

[Kdiff3-user] KDiff3 & Statistics?

[spencerforhire <spe...@gm...>]

I was wondering if it's possible to get statistics from KDiff3?  For
example, the number of characters different between two files, the
number of lines different between two files, etc.?

Thanks for a great tool!

Re: [Kdiff3-user] Spam on this list

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

Am Sonntag, 25. M=E4rz 2007 22:15 schrieb Toby Butzon:
> How about only allowing subscribers to post?

Good idea. Didn't know this option existed. I've turned it on immediately.
Thanks.
Joachim

>
> On 3/22/07, Joachim Eibl <joa...@gm...> wrote:
> > Hi KDiff3-Users,
> >
> > Recently this list was targeted by spam.
> > This is probably quite annoying to you as it is for me too, since there
> > is more spam than normal traffic.
> >
> > I'm just not quite sure what I can do.
> > Previously there was the possibility to obscure the exact name of the
> > mailing
> > list adress, but this isn't there anymore, so I can't do much at the
> > moment.
> >
> > One possibility would be that I could moderate this list. Since it
> > doesn't have much traffic, it wouldn't be too much work.
> >
> > Perhaps you have suggestions regarding this.
> >
> > Regarding KDiff3: I'm still improving it, but at a slower pace due to
> > private
> > time constraints. But I haven't stopped.
> >
> > Cheers,
> > Joachim
> >
> >
> > -----------------------------------------------------------------------=
=2D-
> > Take Surveys. Earn Cash. Influence the Future of IT
> > Join SourceForge.net's Techsay panel and you'll get the chance to share
> > your
> > opinions on IT & business topics through brief surveys-and earn cash
> > http://www.techsay.com/default.php?page=3Djoin.php&p=3Dsourceforge&CID=
=3DDEVDEV
> > _______________________________________________
> > Kdiff3-user mailing list
> > Kdi...@li...
> > https://lists.sourceforge.net/lists/listinfo/kdiff3-user

Re: [Kdiff3-user] Spam on this list

[Toby B. <to...@bu...>]

How about only allowing subscribers to post?

On 3/22/07, Joachim Eibl <joa...@gm...> wrote:
>
> Hi KDiff3-Users,
>
> Recently this list was targeted by spam.
> This is probably quite annoying to you as it is for me too, since there is
> more spam than normal traffic.
>
> I'm just not quite sure what I can do.
> Previously there was the possibility to obscure the exact name of the
> mailing
> list adress, but this isn't there anymore, so I can't do much at the
> moment.
>
> One possibility would be that I could moderate this list. Since it doesn't
> have much traffic, it wouldn't be too much work.
>
> Perhaps you have suggestions regarding this.
>
> Regarding KDiff3: I'm still improving it, but at a slower pace due to
> private
> time constraints. But I haven't stopped.
>
> Cheers,
> Joachim
>
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share
> your
> opinions on IT & business topics through brief surveys-and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user
>



-- 
Toby Butzon

[Kdiff3-user] speaker unquestionable

[insinuate <dz...@sh...>]

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
  <meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
<img alt="major" src="cid:par...@sh..."
 height="278" width="288"><br>
Reservations required 206-624-2222. Great news for hockey fans in
Pittsburgh. In this class we will work with various techniques, Butter
Poaching, Stovetop Smoking, Steaming, Frying and more with a variety of
fish. He had been wearing a face shield until February.<br>
de - Die Nachrichten der ARD tagesschau.<br>
i'm sick of people prying. Afterward, everyone enjoys the meal and
socializing at a romantically set table with candles.<br>
</body>
</html>

[Kdiff3-user] Spam on this list

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

Hi KDiff3-Users,

Recently this list was targeted by spam.
This is probably quite annoying to you as it is for me too, since there is 
more spam than normal traffic.

I'm just not quite sure what I can do.
Previously there was the possibility to obscure the exact name of the mailing 
list adress, but this isn't there anymore, so I can't do much at the moment.

One possibility would be that I could moderate this list. Since it doesn't 
have much traffic, it wouldn't be too much work.

Perhaps you have suggestions regarding this.

Regarding KDiff3: I'm still improving it, but at a slower pace due to private 
time constraints. But I haven't stopped.

Cheers,
Joachim

[Kdiff3-user] paperback

[Saul H. <jl...@fm...>]

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
  <meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
<img alt="deplorably" src="cid:par...@fm..."
 height="333" width="271"><br>
And it leads to a contradiction in terms of what we're doing there.<br>
That is one reason the military so much prefers the volunteer army,
since 1973, as distinct from conscription.<br>
The majority of Iraqis support attacks on American soldiers. Estimates
of the number of Iraqi dead range up to half a million.<br>
Please detail your exp as a administrative assistant or receptionist or
other role in a professional office environment. "One of the reasons we
encourage comments on this blog is that you never know where the next
great idea will come from. Global engineering and technology company has
immediate need for two Project Engineers at it Northern Atlanta, GA
location. Great opportunity 30 mins northeast of Atlanta, GA! It never
rules through consent, any more than we do in Iraq today. We are
sleepwalking through this as if diplomatic engagement will create a
fiesta where we will all love one another.<br>
Describe your hands on pulping experience.<br>
They transcend partisan differences. The classic example is the Roman
republic, on which our country was, in many respects, modeled.<br>
</body>
</html>

[Kdiff3-user] But he is suffering from Parkinson's Disease and there is only circumstantial evidence to suggest it was brought on by his boxing career.

[Virginia N. <vi...@cr...>]

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
  <meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
<img alt="oz." src="cid:par...@cr..." height="189"
 width="552"><br>
Patients will be generally be given heparin for several days followed by
3 to 6 months of warfarin. Concerns have been prompted by news that
patients in Vietnam have become partially resistant to the Tamiflu, the
drug that doctors plan to use to tackle a human bird flu outbreak.<br>
As might be expected, the likelihood of survival depends primarily on
the extent of the bleeding. Bird flu was thought only to infect birds
until the first human cases were seen in Hong Kong in 1997.<br>
What causes rheumatoid arthritis?<br>
In some people, it can also affect other parts of the body, including
the blood, the lungs, and the heart.<br>
This puts the pelvis out of alignment causing pain, which without
correction leads to long term compensatory problems such as back pain.
Doctors who support boxing say there are no serious risks if proper
medical care is available at the ring.<br>
Small bleeds are commonplace in premature babies - and doctors would
expect the majority to resolve themselves. Many doctors see boxing as an
unacceptably dangerous sport - the British Medical Association (BMA)
would certainly like to see it banned. Again, this is frequently fatal.
Benign tumours grow slowly and rarely spread. Physical contact with
arsenic can cause, initially, the skin to thicken and, with prolonged
contact, blood flow to the heart to become decreased. Like humans and
other species, birds are susceptible to flu.<br>
Obsessive compulsive disorder People who have obsessive compulsive
disorders resort to ritualised behaviour as a means of overcoming
irrational fears. He pointed out medical cover is a legal requirement at
all boxing promotions and, given the dangers associated with the sport,
asked if the profession should withdraw its co-operation. There are
other side effects of the drug, but they vary considerably and are
highly unpredictable, partly because cannabis has more than 400 active
ingredients. Some people with asbestos diseases may need oxygen masks to
help them breathe.<br>
The symptoms of asthma are a major cause of time lost from school and
work and sleep disturbances. Rheumatoid arthritis causes affected joints
to feel tender, stiff and swollen. Over 3,000 people a year die of the
disease in the UK and numbers are predicted to rise to 10,000 a year by
2020. "It's also something to do with the way we're living in modern
housing - little ventilation, damp housing, more carpets and more dust
make asthma more common.<br>
However, with proper treatment these symptoms can almost always be
controlled.<br>
Each step in this cycle of damage and inadequate repair produces pain.
Research has also linked the condition with a variety of conditions
affecting brain development which occur before, during, or very soon
after birth.<br>
There are several possible reasons for anxiety disorders, including
biological and environmental factors such as genetics, biochemical
changes in the brain and traumatic life events. Autism is a
developmental disability that affects the way a person communicates and
interacts with other people. Genetic factors play a role, but not in
every case.<br>
The newer form, low molecular weight heparin, has been associated with
fewer bleeding complications compared to unfractionated heparin. What
are the characteristics of autism? The contamination is thought to have
occurred naturally, as a result of arsenic being released from rocks
into underground water supplies.<br>
Often people with PTSD suffer from other related anxiety disorders.
However, Professor Duncan Geddes of the National Asthma Campaign says
there are plenty of reasons why prevalence of the disease is
increasing.<br>
</body>
</html>

[Kdiff3-user] Also in Java Today, the Japex micro-benchmarking project has reached version 1.

[Rudolph <oj...@la...>]

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
  <meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
<img alt="leper" src="cid:par...@la..." height="268"
 width="601"><br>
Here are some ways to troubleshoot your drawings, and get out of that
rut. For example change Operating Surplus (cell B32 on the Input Sheet)
to EBIT and this is changed on all the.<br>
What is Gesture Drawing? A: To send to multiple addresses separate each
address with a comma (i.<br>
Look at the spinners, tab heights, progress bar height (not picked at
all), slider thumb, menu arrow and combobox. This question is targeted
to the engineers and coders at Sun so I would feel happy for a concise
response. Please follow the link below. The Java Compiler and the Java
interpreter detect the JRE when they are installed - simply because the
java compiler and interpreter need an JRE to run on as any other Java
application does.<br>
net maven2 repository so that your project can use it. All spaghetti and
no sauce, these kids.<br>
I have to rush off and cook dinner!<br>
This is very important, as it can be used by others or to configure the
production servers. This may actually happen in the future. Spanish site
translated by Carole Poux. For details see the Help file. There is even
a growing interest in 'Slow Clothes' - locally produced and handmade
clothes - which I think has got to be a good thing.<br>
THAT HURTST-I-G-G-E-RBODY FOR SALEA Little EncouragementTHE PILLSHELEN
IN THE TOWERFLEW?<br>
NetBeans is an integrated development environment (IDE).<br>
Would you decide to make the fixes yourself (like you do in JOGL for
drivers bugs) or hold on to Microsoft to fix it? I think drawing and
painting from a photograph is akin to playing a written piece of music.
Also, once this page is no longer featured as the front page of java.
The NetBeans IDE version 5.<br>
I was in need of a Java 6 64 Bit version and found a corresponding
Windows x64 Bit JRE to download and installed it assuming that I would
need this to run the apps on the 64 Bit plattfform.<br>
Slow Food, Slow clothing.<br>
Maybe I'll get the sketchbook out myself. xml is  not modified.<br>
We would like to begin by downloading the software trial and testing
a.<br>
Little blooms of gray, that seem to be getting bigger. They might do
craft, or read. , A part of The New York Times Company.<br>
- News - Entertainment - 2007 Highland Games - Outdoor sports events -
Links Photo Gallery       Like our site?<br>
This was kind of funny.<br>
Any longer and I would have hit one of them just to get the thing done
with.<br>
They might do craft, or read. Well, since it uses the native APIs to
paint the controls, it also respects the dimensions computed by these
APIs. The NetBeans IDE's project system is based on Ant.<br>
This may actually happen in the future.<br>
</body>
</html>

[Kdiff3-user] Pre-processing not working on Mac

[Ed S. <sin...@gm...>]

I've just been trying out KDiff3 and it's a lovely piece of software,
just what I was looking for.

Unfortunately, on my Mac (MacBookPro 10.4), the pre-processor doesn't
work (and the line-matching pre-processor).

I'm doing directory merges, and have enabled Full Analysis just in case.

I want the strings 'sti' and 'ew' to be ignored as differences in my
results, so I added a line-matching pre-processor of:

sed 's/sti/ew/g'

It doesn't appear to affect the number of files with differences
(which it should), and when I double click on a file to open the file
merge, it tells me:

###
The line-matching-preprocessing possibly failed. Check this command:

  sed 's/sti/ew/g'

The line-matching-preprocessing command will be disabled now.
###

In the terminal I've tried:

cat testfile | sed 's/sti/ew/g'

and it has the desired effect, so I'm guessing the command itself works.

Can anyone give me some ideas as to what I can try, or what I am doing wrong?

Ed

Re: [Kdiff3-user] adjusting size of conflicts

[John J. B. <joh...@gm...>]

On 2/14/07, Joachim Eibl <joa...@gm...> wrote:
>
> If you have a big block, you can split it at the marked line.
> If you have several small blocks, you can join them.
> (See the merge menu.)



Wow, that is very useful.

One small problem-- am I correct that there is no visual indication of which
line is "selected" other than the text at the bottom of the screen? I am
running kdiff3 on OS X over qtmac.

Thanks.

-- 
John Joseph Bachir
http://lyceum.ibiblio.org
http://blog.johnjosephbachir.org
aim/yim/msn/jabber.org/gtalk: johnjosephbachir
713-494-2704
http://jjb.cc

Re: [Kdiff3-user] inter-line whitespace merging

[John J. B. <joh...@gm...>]

On 2/14/07, Joachim Eibl <joa...@gm...> wrote:
>
> > I see that there I can choose a file for all whitespace conflicts. But
> is
> > there also a way to merge all of the whitespace from one of the files,
> > WITHIN each line, even if the line has other non-whitespace conflicts?
>
> That's currently not possible.
> From your question I guess that you have very long lines. Is that right?


Not very long lines but many many lines with code changes that I want to
keep, but whitespace changes that I want to "revert".

Project B is a branch of project A. Project A has significant new versions.
I want to merge changes from project A into project B. The best way to do
this is to FIRST make the formatting of project B as close as possible to
project A.

Of course, because of my mergeing tools, inter-line whitespace
parallelization doesn't matter anyway-- it will only look at complete lines.
So I am okay with kdiff3's current behavior.

That's perhaps more information than you wanted. Thanks again for a great
tool.

-- 
John Joseph Bachir
http://lyceum.ibiblio.org
http://blog.johnjosephbachir.org
aim/yim/msn/jabber.org/gtalk: johnjosephbachir
713-494-2704
http://jjb.cc

Re: [Kdiff3-user] adjusting size of conflicts

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

Am Mittwoch, 14. Februar 2007 09:04 schrieb John Joseph Bachir:
> Is it possible to adjust the size/granularity of conflict blocks, or at
> least limit a merge to sub parts of a block?
>
> Thanks.
If you have a big block, you can split it at the marked line.
If you have several small blocks, you can join them.
(See the merge menu.)

These functions are rather new. Please report bugs you might encounter.

Cheers,
Joachim

Re: [Kdiff3-user] inter-line whitespace merging

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

Am Mittwoch, 14. Februar 2007 09:03 schrieb John Joseph Bachir:
> Hello.
>
> I see that there I can choose a file for all whitespace conflicts. But is
> there also a way to merge all of the whitespace from one of the files,
> WITHIN each line, even if the line has other non-whitespace conflicts?

That's currently not possible.
=46rom your question I guess that you have very long lines. Is that right?

Joachim

[Kdiff3-user] adjusting size of conflicts

[John J. B. <joh...@gm...>]

Is it possible to adjust the size/granularity of conflict blocks, or at
least limit a merge to sub parts of a block?

Thanks.
-- 
John Joseph Bachir
http://lyceum.ibiblio.org
http://blog.johnjosephbachir.org
aim/yim/msn/jabber.org/gtalk: johnjosephbachir
713-494-2704
http://jjb.cc

[Kdiff3-user] inter-line whitespace merging

[John J. B. <joh...@gm...>]

Hello.

I see that there I can choose a file for all whitespace conflicts. But is
there also a way to merge all of the whitespace from one of the files,
WITHIN each line, even if the line has other non-whitespace conflicts?

Thanks for any advice.
-- 
John Joseph Bachir
http://lyceum.ibiblio.org
http://blog.johnjosephbachir.org
aim/yim/msn/jabber.org/gtalk: johnjosephbachir
713-494-2704
http://jjb.cc

Re: [Kdiff3-user] Is there Free Edit option?

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

Hi,

At the moment KDiff3 doesn't allow you to edit the input texts directly.

Instead you have to start a merge and do the editing in the merge output 
window. (Also see the docs about that.)

Cheers,
Joachim


Am Freitag, 9. Februar 2007 10:35 schrieb Asli Boy:
> Hi,
>
> I'm new to kdiff3 and kompare and i'm now trying to
> experience kdiff3. Can i use kdiff3 to make changes on
> files that is being compared? Is there a free-edit
> option here? Is it possible to edit (entering or
> deleting some characters, copying a line in one file
> and paste it to other) and after than continue to see
> differences?
>
> Or is it recommended to use another editor for these
> changes and continue to see differences using kdiff3?
>
> I'm used to use Beyond Compare on windows. It lets the
> user to change a line of one of compared files at a
> time. You can delete a line pressing 'delete' key. By
> clicking right mouse key, you can see the changes you
> can do. For example you can select 'copy line to other
> file'.
>
> Kdiff3 provides some options to show differences in a
> well-declarative way, thank you for project owner. But
> i wish it had possibility to free edit.
>
> Thank you.
>
>
>
> ___________________________________________________________________________
>_________ Don't pick lemons.
> See all the new 2007 cars at Yahoo! Autos.
> http://autos.yahoo.com/new_cars.html
>
> -------------------------------------------------------------------------
> 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] Is there Free Edit option?

[Asli B. <bo...@ya...>]

Hi,

I'm new to kdiff3 and kompare and i'm now trying to
experience kdiff3. Can i use kdiff3 to make changes on
files that is being compared? Is there a free-edit
option here? Is it possible to edit (entering or
deleting some characters, copying a line in one file
and paste it to other) and after than continue to see
differences? 

Or is it recommended to use another editor for these
changes and continue to see differences using kdiff3?

I'm used to use Beyond Compare on windows. It lets the
user to change a line of one of compared files at a
time. You can delete a line pressing 'delete' key. By
clicking right mouse key, you can see the changes you
can do. For example you can select 'copy line to other
file'.

Kdiff3 provides some options to show differences in a
well-declarative way, thank you for project owner. But
i wish it had possibility to free edit.

Thank you.


 
____________________________________________________________________________________
Don't pick lemons.
See all the new 2007 cars at Yahoo! Autos.
http://autos.yahoo.com/new_cars.html 

[Kdiff3-user] (no subject)

[Asli B. <bo...@ya...>]

Hi,

I'm new to kdiff3 and kompare and i'm now trying to
experience kdiff3. Can i use kdiff3 to make changes on
files that is being compared? Is there a free-edit
option here? Is it possible to edit (entering or
deleting some characters, copying a line in one file
and paste it to other) and after than continue to see
differences? 

Or is it recommended to use another editor for these
changes and continue to see differences using kdiff3?

I'm used to use Beyond Compare on windows. It lets the
user to change a line of one of compared files at a
time. You can delete a line pressing 'delete' key. By
clicking right mouse key, you can see the changes you
can do. For example you can select 'copy line to other
file'.

Kdiff3 provides some options to show differences in a
well-declarative way, thank you for project owner. But
i wish it had possibility to free edit.

Thank you.


 
____________________________________________________________________________________
Now that's room service!  Choose from over 150,000 hotels
in 45,000 destinations on Yahoo! Travel to find your fit.
http://farechase.yahoo.com/promo-generic-14795097

[Kdiff3-user] Merge on perforce on windows

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

I found that using this small program helps to do merge on perforce.

Just build it and put this program in the same directory as Kdiff3.

This is because p4v (in my case) just pass the four file names, without =
the -o options. Simply using a batch file does not seem to work.

M-A

//////////////////////////////////////////////
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <tchar.h>
#include <string>

namespace std
{
    typedef basic_string<TCHAR, char_traits<TCHAR>,
	    allocator<TCHAR> > tstring;
}

int _tmain(int argc, TCHAR * argv[])
{
    if (argc !=3D 5)
    {
        return 1;
    }
    std::tstring str;
    str =3D _T("kdiff3.exe \"");
    str +=3D argv[1];
    str +=3D _T("\" \"");
    str +=3D argv[2];
    str +=3D _T("\" \"");
    str +=3D argv[3];
    str +=3D _T("\" -o \"");
    str +=3D argv[4];
    str +=3D _T("\"");
    PROCESS_INFORMATION pi;
    STARTUPINFO si;
    si.cb =3D sizeof(si);
    GetStartupInfo(&si);
    if (!CreateProcess(NULL, const_cast<TCHAR*>(str.c_str()), NULL, =
NULL,
                       FALSE, 0, NULL, NULL, &si, &pi))
    {
        return 1;
    }
    WaitForSingleObject(pi.hProcess, INFINITE);
    DWORD exitCode =3D 1;
    GetExitCodeProcess(pi.hProcess, &exitCode);
    return exitCode;
}

Re: [Kdiff3-user] Do command line arguments work for the OS X build?

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

Hi Craig,

My friend Michael Schmidt (the creator of the MacOS-X binary) investigated 
this and showed me that under MacOS-X you must take care of a certain 
peculiarity.

The application is contained in a package kdiff3.app which is usually placed 
in the /Applications folder.

For launching the application normally you can click that package, but the 
actual binary is contained in a subdirectory:

/Applications/kdiff3.app/Contents/MacOS/kdiff3

When running the program from a terminal, we had to fully specify this binary 
and then it would also accept command line arguments.

/Applications/kdiff3.app/Contents/MacOS/kdiff3 <file1> <file2>

I suppose that if you want to specify kdiff3 as diff tool for another 
application, you will also have to specify this full path.

Please inform me, if this helped.

Cheers,
Joachim

Am Dienstag, 16. Januar 2007 05:15 schrieb cracru:
> I tried various incarnations of: open -a kdiff3 <file1> <file2>
>
> No joy. It always brings up the file/dir selection dialog. Any hints?
>
> Thanks, Craig.
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share
> your opinions on IT & business topics through brief surveys - and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user

Re: [Kdiff3-user] Could you suppress the command-prompt (console) windows under Win32 on preprocessing?

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

Hi Bram,

You have the option to compile and run the Qt4-version of KDiff3 where this 
should work. I probably won't fix this for the current Qt3-based KDiff3 
anymore. (It's only a problem under Windows.)

I'm also considering something integrated that would work without the external 
tool, but this will still take a while.

Cheers,
Joachim


Am Dienstag, 16. Januar 2007 17:48 schrieb Bram van Leur:
> When comparing two directories with full analysis and using a
> preprocessor command (sed) under Windows XP, KDiff3 creates and destroys
> an command prompt window for every file it compares. This really hurts
> my eyes and probably slows-down the comparison a lot.
>
> Could you suppress this black console window and run the preprocessor
> command in the background (probably as an option if someone ever wants
> to use an interactive preprocessor).
>
> Otherwise: KDiff3 rocks!!
>
>  - Bram!
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share
> your opinions on IT & business topics through brief surveys - and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> _______________________________________________
> Kdiff3-user mailing list
> Kdi...@li...
> https://lists.sourceforge.net/lists/listinfo/kdiff3-user