Menu
▾
▴
kdiff3-user
|
From: Asli B. <bo...@ya...> - 2007-02-09 09:34:39
|
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 |
|
From: owzar001 <owz...@du...> - 2010-07-28 05:15:18
|
Hi.
I am relatively new user of kdiff3. I have found to be very useful
in conjunction with mercurial.
I would like to pose a potentially trivial question on merging
multiple changes within a single line using the following toy example.
Suppose that an author provides the following document for
review
foo@kolmogorov:/tmp$ cat author/foo.tex
This is a simple randomm sample.
A co-author proceeds by editing the file by correcting the typo and
by deleting the word "simple"
foo@kolmogorov:/tmp$ cat coauthor/foo.tex
This is a random sample.
It is possible fo author to use kdiff3 to accept the typo but
not the deletion of "simple" to get
foo@kolmogorov:/tmp$ cat author/foo.tex
This is a simple random sample.
I am using kdiff3 0.9.92 on Debian Lenny AMD64.
Sincerely,
Kouros
foo@kolmogorov:/tmp$ apt-cache policy kdiff3
kdiff3:
Installed: 0.9.92-2
Candidate: 0.9.92-2
Version table:
*** 0.9.92-2 0
650 http://ftp.us.debian.org lenny/main Packages
100 /var/lib/dpkg/status
|
|
From: Joachim E. <joa...@gm...> - 2010-07-31 14:24:16
|
Hi Kouros, If there are multiple changes in a line and you want to select them individually, then you have to edit that line in the merge output window. For the moment there is no special feature in the GUI allowing a more direct approach. I admit, that is is not ideal if the lines are very long. Best regards, Joachim > Hi. > > I am relatively new user of kdiff3. I have found to be very useful > in conjunction with mercurial. > > I would like to pose a potentially trivial question on merging > multiple changes within a single line using the following toy example. > > Suppose that an author provides the following document for > review > foo@kolmogorov:/tmp$ cat author/foo.tex > This is a simple randomm sample. > > A co-author proceeds by editing the file by correcting the typo and > by deleting the word "simple" > > foo@kolmogorov:/tmp$ cat coauthor/foo.tex > This is a random sample. > > It is possible fo author to use kdiff3 to accept the typo but > not the deletion of "simple" to get > > foo@kolmogorov:/tmp$ cat author/foo.tex > This is a simple random sample. > > I am using kdiff3 0.9.92 on Debian Lenny AMD64. > > Sincerely, > > Kouros > > foo@kolmogorov:/tmp$ apt-cache policy kdiff3 > kdiff3: > Installed: 0.9.92-2 > Candidate: 0.9.92-2 > Version table: > *** 0.9.92-2 0 > 650 http://ftp.us.debian.org lenny/main Packages > 100 /var/lib/dpkg/status > > > --------------------------------------------------------------------------- > --- The Palm PDK Hot Apps Program offers developers who use the > Plug-In Development Kit to bring their C/C++ apps to Palm for a share > of $1 Million in cash or HP Products. Visit us here for more details: > http://ad.doubleclick.net/clk;226879339;13503038;l? > http://clk.atdmt.com/CRS/go/247765532/direct/01/ > _______________________________________________ > Kdiff3-user mailing list > Kdi...@li... > https://lists.sourceforge.net/lists/listinfo/kdiff3-user > |
|
From: owzar001 <owz...@du...> - 2010-08-01 05:13:47
|
Hi Joachim. Thanks for your response. I did not realize that I could edit the output window from within kdiff3. In response to my question, a colleague of mine had suggested that I use MS track change instead. I think he meant to be funny. Thanks for contributing kdiff3. Take care, Kouros On Sat, 31 Jul 2010, Joachim Eibl wrote: > Hi Kouros, > > If there are multiple changes in a line and you want to select them > individually, then you have to edit that line in the merge output window. For > the moment there is no special feature in the GUI allowing a more direct > approach. I admit, that is is not ideal if the lines are very long. > > Best regards, > Joachim > > >> Hi. >> >> I am relatively new user of kdiff3. I have found to be very useful >> in conjunction with mercurial. >> >> I would like to pose a potentially trivial question on merging >> multiple changes within a single line using the following toy example. >> >> Suppose that an author provides the following document for >> review >> foo@kolmogorov:/tmp$ cat author/foo.tex >> This is a simple randomm sample. >> >> A co-author proceeds by editing the file by correcting the typo and >> by deleting the word "simple" >> >> foo@kolmogorov:/tmp$ cat coauthor/foo.tex >> This is a random sample. >> >> It is possible fo author to use kdiff3 to accept the typo but >> not the deletion of "simple" to get >> >> foo@kolmogorov:/tmp$ cat author/foo.tex >> This is a simple random sample. >> >> I am using kdiff3 0.9.92 on Debian Lenny AMD64. >> >> Sincerely, >> >> Kouros >> >> foo@kolmogorov:/tmp$ apt-cache policy kdiff3 >> kdiff3: >> Installed: 0.9.92-2 >> Candidate: 0.9.92-2 >> Version table: >> *** 0.9.92-2 0 >> 650 http://ftp.us.debian.org lenny/main Packages >> 100 /var/lib/dpkg/status >> >> >> --------------------------------------------------------------------------- >> --- The Palm PDK Hot Apps Program offers developers who use the >> Plug-In Development Kit to bring their C/C++ apps to Palm for a share >> of $1 Million in cash or HP Products. Visit us here for more details: >> http://ad.doubleclick.net/clk;226879339;13503038;l? >> http://clk.atdmt.com/CRS/go/247765532/direct/01/ >> _______________________________________________ >> Kdiff3-user mailing list >> Kdi...@li... >> https://lists.sourceforge.net/lists/listinfo/kdiff3-user >> > |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X