Menu
▾
▴
kdiff3-user — User questions about KDiff3.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
(2) |
Mar
(30) |
Apr
(22) |
May
(8) |
Jun
(6) |
Jul
(4) |
Aug
(3) |
Sep
(14) |
Oct
|
Nov
(14) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(12) |
Feb
(5) |
Mar
(8) |
Apr
|
May
(9) |
Jun
(2) |
Jul
(9) |
Aug
(9) |
Sep
(4) |
Oct
(18) |
Nov
(9) |
Dec
(6) |
| 2006 |
Jan
(3) |
Feb
(6) |
Mar
(5) |
Apr
(7) |
May
(7) |
Jun
(7) |
Jul
(2) |
Aug
(5) |
Sep
(18) |
Oct
(10) |
Nov
(6) |
Dec
(1) |
| 2007 |
Jan
(13) |
Feb
(9) |
Mar
(20) |
Apr
(7) |
May
(3) |
Jun
|
Jul
(7) |
Aug
(7) |
Sep
|
Oct
(8) |
Nov
(16) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(6) |
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
(3) |
| 2009 |
Jan
(22) |
Feb
(15) |
Mar
(7) |
Apr
|
May
(2) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(4) |
Feb
|
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
(8) |
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2011 |
Jan
|
Feb
(9) |
Mar
|
Apr
(3) |
May
(4) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
(8) |
Oct
(2) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
(2) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(8) |
Sep
(2) |
Oct
|
Nov
|
Dec
(4) |
| 2013 |
Jan
(3) |
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(1) |
| 2014 |
Jan
(2) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(6) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(1) |
| 2015 |
Jan
(9) |
Feb
|
Mar
|
Apr
(3) |
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Maurice v. d. P. <gri...@kf...> - 2014-08-19 14:02:33
|
On Tue, Aug 05, 2014 at 02:58:59PM +0930, Brendan wrote: > Is there any chance KDiff3 could be changed to automatically save and > continue the merge, if there are 0 unsolved conflicts? Or if other users > don't want this to happen automatically all the time, would it be possible > to get a setting so that I can make it happen that way when I want it to? I think the --auto switch is what you need. Regards, Maurice. -- Maurice van der Pot Gnome Planner Developer gri...@kf... http://live.gnome.org/Planner |
|
From: Brendan <br...@th...> - 2014-08-05 05:46:47
|
Hi All
I regularly use KDiff3 to incorporate vendor changes to our customised
source files. So it's a 3-way merge, with the vendor's old version 4.6 as
A (Base), their new version 4.7 as B, our customised copy of 4.6 as C, and
the output is a newly customised version of 4.7.
If the vendors haven't touched a file that we've customised, then KDiff3
uses our old customised version automagically, which is great. When they
have updated a page that we haven't customised, KDiff3 automagically uses
the vendor's new version. Again, this is great.
And of course if the vendor has changed some lines of a file and we've
customised the same lines, then naturally KDiff3 needs to ask a human how
to fix it. Which is fair enough.
But when the vendor has changed some lines at the top of a file, and we've
customised some lines right down the bottom (so there's 0 unsolved
conflicts), it'd be great if KDiff3 could just do the merge and save,
without me needing to click OK, then save, then F7 again.
I have a few hundred files in these directories, and around 50 to 100
pages that we've customised are changed by the vendor each time, but
almost all are 0 unsolved conflicts. Usually there's less than a dozen
where I actually have to look at the lines and work out what to do. But I
have to click OK on the "Conflicts" box, then control-S to save, then F7
to continue again for all 50 to 100 changes, which is time-consuming.
Is there any chance KDiff3 could be changed to automatically save and
continue the merge, if there are 0 unsolved conflicts? Or if other users
don't want this to happen automatically all the time, would it be possible
to get a setting so that I can make it happen that way when I want it to?
Thanks,
Brendan.
|
|
From: Joachim E. <Joa...@gm...> - 2014-07-04 15:50:46
|
<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div>Hi KDiff3 users,</div> <div> </div> <div>It's been quite a while, but now the new version is there.</div> <div> </div> <div>The main new feature is the use of QTextLayout for rendering. This brings several improvements (see below) but was much more effort than expected. Especially because it is more expensive to compute I also introduced multithreading to make use of all available cores and allow interruptability especially when wordwrap is on.</div> <div> </div> <div>Binaries for Windows (32 & 64 bit) and Mac-OSX (64 bit) are available too.</div> <div> </div> <div>Details and checksums see below.</div> <div> </div> <div>Best regards,</div> <div>Joachim</div> <div> </div> <div> </div> <div>Version 0.9.98 - 2014-07-04<br/> ===========================<br/> - Text rendering now with QTextLayout fixes the following issues<br/> - Correct handling for variable width fonts.<br/> - Corrected display of highlighted text with Qt4.8.x on Ubuntu and Mac.<br/> - Improved handling of texts with both right to left and left to right languages (mixed Arabic and western texts).<br/> - Improved handling of Chinese and Japanese.<br/> - Whitespace characters are now shown as dots for spaces and arrows for tabs, and not only in differences.<br/> - Fixed symlink comparison (Qt4 symLinkTarget returns absolute paths)<br/> - Text analysis for rendering with QTextLayout is interruptable and multithreaded.<br/> (See progressbar and abort-button in statusbar)<br/> - Fix for saving to relative path in KDE-environments. (Patch from Harald Sitter)<br/> - Fixed bug in 0.9.97: Directory compare was always case sensitive.<br/> - Fix for saving files on KDE with relative path specified via command line option -o.<br/> - Fixed problem with KIO (nonlocal urls).<br/> - Improved Mac support.<br/> - Write --confighelp information to stdout instead of stderr.<br/> - Directory Merge Window: Enabled state of "Delete A And B" now also depends on existence of source file A.<br/> - Works now with Qt4 and Qt5<br/> - Progress dialog during printing.<br/> - Workaround for bug in QSplitter::childEvent that broke QFileDialog::getSaveFileName</div> <div> </div> <div> <div>Checksums:</div> <div>kdiff3-0.9.98.tar.gz<br/> SHA1: 1390b4ca9c58316de49cb0aabb433f14ebf2dc3f <br/> MD5: b52f99f2cf2ea75ed5719315cbf77446 </div> <div>KDiff3-32bit-Setup_0.9.98.exe<br/> SHA1: a7a7bb895038821fec1146300c043ed56a6f226c <br/> MD5: d5ad58fbf188f5c036a58f246c27ae46 </div> <div>KDiff3-64bit-Setup_0.9.98.exe<br/> SHA1: 6c853215b62a4dbb5bde8475eb4f64d14a6a2dbc <br/> MD5: bf02bc2b5a42d91e9e047542391ec7ca </div> <div>kdiff3-0.9.98-MacOSX-64Bit.dmg<br/> SHA1: e8420a22184cc1769332687845e7b442a5032dc9 <br/> MD5: 96c65c3636146a9d24ba631f164891b7 </div> <div> </div> </div></div></body></html> |
|
From: Joachim E. <Joa...@gm...> - 2014-02-19 09:00:17
|
<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div> <div>Hi Antonio,</div> <div> </div> <div>I misunderstood the question initially.</div> <div>KDiff3 doesn't do anything in that respect. (Preventing sleep, standby, screensavers etc.)</div> <div>Please try "caffeine" or similar tools.</div> <div> </div> <div>Best regards,</div> <div>Joachim</div> <div> </div> <div> </div> <div> <div style="margin: 10.0px 5.0px 5.0px 10.0px;padding: 10.0px 0 10.0px 10.0px;border-left: 2.0px solid rgb(195,217,229);"> <div style="margin: 0 0 10.0px 0;"><b>Gesendet:</b> Mittwoch, 19. Februar 2014 um 09:21 Uhr<br/> <b>Von:</b> dic...@vo...<br/> <b>An:</b> Joa...@gm...<br/> <b>Betreff:</b> Re: Aw: [Kdiff3-user] My Mac goes to sleep when running kdiff3</div> <div> <div class="xam_msg_class"> <div style="font: normal 13.0px Arial;color: rgb(51,51,51);"><br/> I'm using 0.9.97 on OS X 10.9.1 . The issue happens systematically when the comparison lasts enough.<br/> <br/> Antonio.<br/> <br/> <br/> <br/> <div><span style="font-family: Arial;font-size: 11.0px;color: rgb(95,95,95);">Da</span><span style="font-family: Arial;font-size: 12.0px;color: rgb(95,95,95);padding-left: 5.0px;">: "Joachim Eibl" Joa...@gm...</span></div> <div><span style="font-family: Arial;font-size: 11.0px;color: rgb(95,95,95);">A</span><span style="font-family: Arial;font-size: 12.0px;color: rgb(95,95,95);padding-left: 5.0px;">: dic...@vo...</span></div> <div><span style="font-family: Arial;font-size: 11.0px;color: rgb(95,95,95);">Cc</span><span style="font-family: Arial;font-size: 12.0px;color: rgb(95,95,95);padding-left: 5.0px;">: </span></div> <div><span style="font-family: Arial;font-size: 11.0px;color: rgb(95,95,95);">Data</span><span style="font-family: Arial;font-size: 12.0px;color: rgb(95,95,95);padding-left: 5.0px;">: Tue, 18 Feb 2014 22:47:59 +0100</span></div> <div><span style="font-family: Arial;font-size: 11.0px;color: rgb(95,95,95);">Oggetto</span><span style="font-family: Arial;font-size: 12.0px;color: rgb(95,95,95);padding-left: 5.0px;">: Aw: [Kdiff3-user] My Mac goes to sleep when running kdiff3</span></div> <div class="xam_msg_class"> <div style="font-family: Verdana;font-size: 12.0px;"> <div> <div>> Hi Antonio,</div> <div>> </div> <div>> Which version are you using? (0.9.97 is the most recent improving some issues in that area.)</div> <div>> </div> <div>> Best regards,</div> <div>> Joachim</div> <div> <div>> </div> <div>> </div> <div style="margin: 10.0px 5.0px 5.0px 10.0px;padding: 10.0px 0 10.0px 10.0px;border-left: 2.0px solid rgb(195,217,229);"> <div style="margin: 0 0 10.0px 0;"><b>> Gesendet:</b> Montag, 17. Februar 2014 um 09:10 Uhr<br/> <b>> Von:</b> dic...@vo...<br/> <b>> An:</b> kdi...@li...<br/> <b>> Betreff:</b> [Kdiff3-user] My Mac goes to sleep when running kdiff3</div> <div> <div class="xam_msg_class"> <div style="font: normal 13.0px Arial;color: rgb(51,51,51);"><br/> > Dear Joachim,<br/> <br/> > my Mac goes to sleep when I use kdiff3 to compare large directories, so that it takes some time. Is there any possibility to modify kdiff3 in order to avoid this behaviour?<br/> <br/> > Kind regards,<br/> > Antonio.<br/> > </div> </div> ------------------------------------------------------------------------------ Android apps run on BlackBerry 10 Introducing the new BlackBerry 10.2.1 Runtime for Android apps. Now with support for Jelly Bean, Bluetooth, Mapview and more. Get your Android app in front of a whole new audience. Start now. <a href="http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk_______________________________________________" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk_______________________________________________</a> Kdiff3-user mailing list Kdi...@li... <a href="https://lists.sourceforge.net/lists/listinfo/kdiff3-user" target="_blank">https://lists.sourceforge.net/lists/listinfo/kdiff3-user</a></div> </div> </div> </div> </div> </div> </div> </div> </div> </div> </div> </div></div></body></html> |
|
From: <dic...@vo...> - 2014-02-17 08:25:40
|
Dear Joachim, my Mac goes to sleep when I use kdiff3 to compare large directories, so that it takes some time. Is there any possibility to modify kdiff3 in order to avoid this behaviour? Kind regards, Antonio. |
|
From: Joachim E. <Joa...@gm...> - 2014-01-16 13:06:29
|
<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div> <div>Hi,</div> <div> </div> <div>When comparing or merging 3 files (of which the first is the common ancestor) a conflict means that in that line both other files have changed.</div> <div>When comparing only two files then there is no difference.</div> <div> </div> <div>Joachim</div> <div> <div name="quote" style="margin:10px 5px 5px 10px; padding: 10px 0 10px 10px; border-left:2px solid #C3D9E5; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"> <div style="margin:0 0 10px 0;"><b>Gesendet:</b> Donnerstag, 16. Januar 2014 um 12:30 Uhr<br/> <b>Von:</b> "Kirill Golub" <fet...@gm...><br/> <b>An:</b> kdi...@li...<br/> <b>Betreff:</b> [Kdiff3-user] What's the differense between 'Go to Next Delta' and 'Go to Next Conflict' ?</div> <div name="quoted-content">What's the differense between 'Go to Next Delta' and 'Go to Next<br/> Conflict' ? This controls always works the same, so I wonder what are<br/> the situations when they behave differently ?<br/> <br/> ------------------------------------------------------------------------------<br/> CenturyLink Cloud: The Leader in Enterprise Cloud Services.<br/> Learn Why More Businesses Are Choosing CenturyLink Cloud For<br/> Critical Workloads, Development Environments & Everything In Between.<br/> Get a Quote or Start a Free Trial Today.<br/> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk</a><br/> _______________________________________________<br/> Kdiff3-user mailing list<br/> Kdi...@li...<br/> <a href="https://lists.sourceforge.net/lists/listinfo/kdiff3-user" target="_blank">https://lists.sourceforge.net/lists/listinfo/kdiff3-user</a></div> </div> </div> </div></div></body></html> |
|
From: Kirill G. <fet...@gm...> - 2014-01-16 11:31:00
|
What's the differense between 'Go to Next Delta' and 'Go to Next Conflict' ? This controls always works the same, so I wonder what are the situations when they behave differently ? |
|
From: <ana...@wi...> - 2013-12-20 05:43:38
|
Hi all, I trying to build kdiff3-0.9.97 in my machine with the following config Linux 2.6.18-274.el5 #1 SMP Fri Jul 8 17:36:59 EDT 2011 x86_64 x86_64 x86_64 GNU/Linux Red Hat Enterprise Linux Server release 5.7 (Tikanga) [root@xxxx releaseQt]# /usr/lib64/qt4/bin/qmake -v QMake version 2.01a Using Qt version 4.2.1 in /usr/lib64/qt4/lib64 I got the following error when I am trying to make. [root@xxxxxx releaseQt]# make g++ -c -include kdiff3 -m64 -pipe -O2 -D_REENTRANT -Wall -W -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED -I/usr/lib64/qt4/mkspecs/linux-g++-64 -I../src-QT4 -/usr/lib64/qt4/include/QtCore -I/usr/lib64/qt4/include/QtCore -I/usr/lib64/qt4/include/QtGui -I/usr/lib64/qt4/include/QtGui -I/usr/lib64/qt4/include -I../src-QT4 -I../src-QT4/kreplacements -I../src-QT4 -I../src-QT4 -I. -o main.o ../src-QT4/main.cpp In file included from ../src-QT4/kreplacements/kcmdlineargs.h:1, from ../src-QT4/main.cpp:18: ../src-QT4/kreplacements/kreplacements.h:35:40: error: QExplicitlySharedDataPointer: No ../src-QT4/kreplacements/kreplacements.h:288: error: ISO C++ forbids declaration of âQEx ../src-QT4/kreplacements/kreplacements.h:288: error: expected â;â before â<â token ../src-QT4/kreplacements/kreplacements.h: In member function âvoid KConfigGroup::writeEn ../src-QT4/kreplacements/kreplacements.h:298: error: âdâ was not declared in this scope ../src-QT4/kreplacements/kreplacements.h: In member function âvoid KConfigGroup::writeEn: ../src-QT4/kreplacements/kreplacements.h:299: error: âdâ was not declared in this scope ../src-QT4/kreplacements/kreplacements.h: In member function âvoid KConfigGroup::writeEn ../src-QT4/kreplacements/kreplacements.h:300: error: âdâ was not declared in this scope ../src-QT4/kreplacements/kreplacements.h: In member function âT KConfigGroup::readEntry( ../src-QT4/kreplacements/kreplacements.h:302: error: âdâ was not declared in this scope ../src-QT4/kreplacements/kreplacements.h: In member function âQString KConfigGroup::read ../src-QT4/kreplacements/kreplacements.h:303: error: âdâ was not declared in this scope ../src-QT4/kreplacements/kreplacements.h: In member function âQStringList KConfigGroup::char)â: ../src-QT4/kreplacements/kreplacements.h:304: error: âdâ was not declared in this scope Please please help me. It's very urgent. I tried googling and the answers mentioned are not working :( Regards, Srikar. +91 9293151370 |
|
From: Ross M. <rd...@ap...> - 2013-09-09 09:10:43
|
I thought I should share a scenario that resulted in me overwriting several of my source files with the wrong data. I was using drag and drop to put the files I wanted to compare into KDiff3. I drop the file with bits I want to copy in the left window, and the file I want to change in the right window. When I merge, the output file path is that of the file in the right window. After the first merge, I drop in a new file in the left window and a new destination in the right window. I expected the output file destination path to change to the new right window file but it doesn't! I think if the right window file changes, the merge output path should change too, otherwise I have to keep closing and opening KDiff3 for each file pair I want to compare... Of course, I may just be using the system incorrectly, but what I'm doing seems logical (to me) J Regards Ross |
|
From: Marla P. <mp...@en...> - 2013-06-21 20:34:56
|
Hi Joachim, I recently returned to coding with a team using git. I like kdiff3 for the 3-way merge, but I would also like to use it as the git diff.tool. However, it is not very smooth to have the tool launch, then I must quit it and let it launch again for every single file in a git diff. While stepping explicitly from one file to another is necessary and useful when merging conflicts, when reviewing diffs only, I'd like to just jump from one diff to the next one, continuing across file boundaries assuming I can glance at the top and see the name of the current file if I need to. I don't believe this is implemented, and obviously I'd like it to be, I think, but my real question for you is: did you leave this out as a design decision or is it just not implemented? I can use a different tool, like Review Board which we use for code reviews, as a workaround. But I wanted to ask you about this sort of feature in kdiff3. Thanks, Marla |
|
From: Dritan L. [M. IT] <dri...@mo...> - 2013-04-25 10:50:37
|
Hi Joachim, thank you for the answer. Now I can run kdiff3 on Debian. It was needed to connect to the server with the option -X i.e. ssh -X user@host and at the server in /etc/ssh/sshd_config at the line X11Forwarding set to "yes". > Regarding the automerge: If it is sufficient that kdiff3 just terminates without saving anything, then I can provide a --no-gui option in a future version. That would be veeeeeeeery nice :-). I know I should not ask, but nonetheless I'll ask :-) When could you provide the --no-gui option? Best regards, Dritan Am 2013-04-24 14:16, schrieb Joachim Eibl: > Hi Dritan, > The kdiff3-qt package also provides a binary "/usr/bin/kdiff3". So it > conflicts with the default package and only one can be installed at > the same time. > So running "kdiff3" is correct. > If it can't connect to the X server then probably because you are > running as root and your system is not set up to use the X-server. > Try to run kdiff3 as normal user. > Regarding the automerge: If it is sufficient that kdiff3 just > terminates without saving anything, then I can provide a --no-gui > option in a future version. > Joachim > *Gesendet:* Mittwoch, 24. April 2013 um 07:45 Uhr > *Von:* "Dritan Latifi [Motrada IT]" <dri...@mo...> > *An:* "Joachim Eibl" <joa...@gm...> > *Betreff:* Re: [Kdiff3-user] Running kdiff3 without KDE > Hi Joachim, > > thanks for your answer. > > > > The kdiff3-qt is the prebuilt KDE-independant package for all Debian > systems. Yet if it does not run, please provide the output when run > from a console. > > If it is not installed try "sudo apt-get install kdiff3-qt". > > 1. :~$ apt-get install kdiff3-qt > Reading package lists... Done > Building dependency tree > Reading state information... Done > kdiff3-qt is already the newest version. > 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. > 2. :~$ kdiff3 > kdiff3: cannot connect to X server > :~$ kdiff3-qt > -bash: kdiff3-qt: command not found > > > The exit code is 0 if the merge result was saved without conflicts > and 1 if the merge was aborted manually and no result was saved. > > What kind of user interaction is needed on exit code 1 if KDiff3 runs > without KDE? > > > Currently it is not possible that KDiff3 will automatically exit if > conflicts cannot be solved automatically. > > Pity that is not possible. I hoped I could start KDiff3 without user > interaction, because I hoped I could integrate KDiff3 in my > automerge-script, which does run automatically. Only if conflicts > happen the script will mail me. > > > > Best regards, > Dritan > > Am 2013-04-23 22:27, schrieb Joachim Eibl: > > Hi Dritan, > > You can build and run kdiff3 without KDE. > > The kdiff3-qt is the prebuilt KDE-independant package for all > Debian systems. Yet if it does not run, please provide the output > when run from a console. > > If it is not installed try "sudo apt-get install kdiff3-qt". > > Regarding your problem: KDiff3 provides an "--auto" command line > option that will not show any windows if all conflicts were > automatically solved. > > But if some conflicts were not solved then the KDiff3-window will > appear. > > The exit code is 0 if the merge result was saved without conflicts > and 1 if the merge was aborted manually and no result was saved. > > Currently it is not possible that KDiff3 will automatically exit > if conflicts cannot be solved automatically. > > So unless it is very important that your script runs completely > without user interaction KDiff3 can help if you solve your > conflicts immediately. > > Best regards, > > Joachim > > Am Dienstag, 23. April 2013, 07:55:59 schrieb Dritan Latifi > [Motrada IT]: > > > Hi, > > > > > > is there a possibility to run kdiff3 without KDE? I saw > "kdiff3-qt" but > > > I still can not run it on Debian Server. > > > > > > Why I need this? > > > I have an automatic script to merge 2 different branches. When > there is > > > a conflict I get an email. > > > Often there are conflicts which can be automatically resolved by > kdiff3. > > > ( > > > > http://stackoverflow.com/questions/16086484/conflict-when-merging-two-branch > > > es-with-git ) > > > > > > There fore I would need to run kdiff3 if my script detected > conflicts. > > > Then kdiff3 would exit with code 0 (zero) if it has resolved > > > automatically the conflict and would exit with code other then 0 > if it > > > could not resolved the conflict and then I have to resolve the > conflict > > > manually. > > > > > > Is this kind of usage already possible? If not, is it planed to be > > > implemented? > > > > > > FYI: I'm new to kdiff3. > > > > > > Best regards, > > > Dritan > > > > > > > ------------------------------------------------------------------------------ > Try New Relic Now & We'll Send You this Cool Shirt > New Relic is the only SaaS-based application performance monitoring service > that delivers powerful full stack analytics. Optimize and monitor your > browser, app, & servers with just a few lines of code. Try New Relic > and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr > > > _______________________________________________ > Kdiff3-user mailing list > Kdi...@li... > https://lists.sourceforge.net/lists/listinfo/kdiff3-user |
|
From: Joachim E. <Joa...@gm...> - 2013-04-24 12:16:39
|
<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div>
<div>Hi Dritan,</div>
<div> </div>
<div>The kdiff3-qt package also provides a binary "/usr/bin/kdiff3". So it conflicts with the default package and only one can be installed at the same time.</div>
<div>So running "kdiff3" is correct.</div>
<div> </div>
<div>If it can't connect to the X server then probably because you are running as root and your system is not set up to use the X-server.</div>
<div>Try to run kdiff3 as normal user.</div>
<div> </div>
<div>Regarding the automerge: If it is sufficient that kdiff3 just terminates without saving anything, then I can provide a --no-gui option in a future version.</div>
<div> </div>
<div>Joachim</div>
<div>
<div name="quote" style="margin:10px 5px 5px 10px; padding: 10px 0 10px 10px; border-left:2px solid #C3D9E5; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">
<div style="margin:0 0 10px 0;"><b>Gesendet:</b> Mittwoch, 24. April 2013 um 07:45 Uhr<br/>
<b>Von:</b> "Dritan Latifi [Motrada IT]" <dri...@mo...><br/>
<b>An:</b> "Joachim Eibl" <joa...@gm...><br/>
<b>Betreff:</b> Re: [Kdiff3-user] Running kdiff3 without KDE</div>
<div name="quoted-content">
<div style="background-color: rgb(255,255,255);">
<div class="moz-cite-prefix">Hi Joachim,<br/>
<br/>
thanks for your answer.<br/>
<br/>
<br/>
<font color="#3366ff">> The kdiff3-qt is the prebuilt KDE-independant package for all Debian systems. Yet if it does not run, please provide the output when run from a console.<br/>
> If it is not installed try "sudo apt-get install kdiff3-qt".</font><br/>
<br/>
1. :~$ apt-get install kdiff3-qt<br/>
Reading package lists... Done<br/>
Building dependency tree <br/>
Reading state information... Done<br/>
kdiff3-qt is already the newest version.<br/>
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.<br/>
2. :~$ kdiff3<br/>
kdiff3: cannot connect to X server<br/>
:~$ kdiff3-qt<br/>
-bash: kdiff3-qt: command not found<br/>
<br/>
<font color="#3366ff">> The exit code is 0 if the merge result was saved without conflicts and 1 if the merge was aborted manually and no result was saved.</font><br/>
<br/>
What kind of user interaction is needed on exit code 1 if KDiff3 runs without KDE?<br/>
<br/>
<font color="#3366ff">> Currently it is not possible that KDiff3 will automatically exit if conflicts cannot be solved automatically.</font><br/>
<br/>
Pity that is not possible. I hoped I could start KDiff3 without user interaction, because I hoped I could integrate KDiff3 in my automerge-script, which does run automatically. Only if conflicts happen the script will mail me.<br/>
<br/>
<br/>
<br/>
Best regards,<br/>
Dritan<br/>
<br/>
Am 2013-04-23 22:27, schrieb Joachim Eibl:</div>
<blockquote>
<style type="text/css"><!--p, li {
}
--></style>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">Hi Dritan,</p>
<p> </p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">You can build and run kdiff3 without KDE.</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">The kdiff3-qt is the prebuilt KDE-independant package for all Debian systems. Yet if it does not run, please provide the output when run from a console.</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">If it is not installed try "sudo apt-get install kdiff3-qt".</p>
<p> </p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">Regarding your problem: KDiff3 provides an "--auto" command line option that will not show any windows if all conflicts were automatically solved.</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">But if some conflicts were not solved then the KDiff3-window will appear.</p>
<p> </p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">The exit code is 0 if the merge result was saved without conflicts and 1 if the merge was aborted manually and no result was saved.</p>
<p> </p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">Currently it is not possible that KDiff3 will automatically exit if conflicts cannot be solved automatically.</p>
<p> </p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">So unless it is very important that your script runs completely without user interaction KDiff3 can help if you solve your conflicts immediately.</p>
<p> </p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">Best regards,</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">Joachim</p>
<p> </p>
<p> </p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">Am Dienstag, 23. April 2013, 07:55:59 schrieb Dritan Latifi [Motrada IT]:</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> Hi,</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">></p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> is there a possibility to run kdiff3 without KDE? I saw "kdiff3-qt" but</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> I still can not run it on Debian Server.</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">></p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> Why I need this?</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> I have an automatic script to merge 2 different branches. When there is</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> a conflict I get an email.</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> Often there are conflicts which can be automatically resolved by kdiff3.</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> (</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> <a class="moz-txt-link-freetext" href="http://stackoverflow.com/questions/16086484/conflict-when-merging-two-branch" target="_blank">http://stackoverflow.com/questions/16086484/conflict-when-merging-two-branch</a></p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> es-with-git )</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">></p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> There fore I would need to run kdiff3 if my script detected conflicts.</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> Then kdiff3 would exit with code 0 (zero) if it has resolved</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> automatically the conflict and would exit with code other then 0 if it</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> could not resolved the conflict and then I have to resolve the conflict</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> manually.</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">></p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> Is this kind of usage already possible? If not, is it planed to be</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> implemented?</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">></p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> FYI: I'm new to kdiff3.</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">></p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> Best regards,</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">> Dritan</p>
<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">></p>
</blockquote>
</div>
</div>
</div>
</div>
</div></div></body></html>
|
|
From: Joachim E. <joa...@gm...> - 2013-04-23 20:27:42
|
Hi Dritan, You can build and run kdiff3 without KDE. The kdiff3-qt is the prebuilt KDE-independant package for all Debian systems. Yet if it does not run, please provide the output when run from a console. If it is not installed try "sudo apt-get install kdiff3-qt". Regarding your problem: KDiff3 provides an "--auto" command line option that will not show any windows if all conflicts were automatically solved. But if some conflicts were not solved then the KDiff3-window will appear. The exit code is 0 if the merge result was saved without conflicts and 1 if the merge was aborted manually and no result was saved. Currently it is not possible that KDiff3 will automatically exit if conflicts cannot be solved automatically. So unless it is very important that your script runs completely without user interaction KDiff3 can help if you solve your conflicts immediately. Best regards, Joachim Am Dienstag, 23. April 2013, 07:55:59 schrieb Dritan Latifi [Motrada IT]: > Hi, > > is there a possibility to run kdiff3 without KDE? I saw "kdiff3-qt" but > I still can not run it on Debian Server. > > Why I need this? > I have an automatic script to merge 2 different branches. When there is > a conflict I get an email. > Often there are conflicts which can be automatically resolved by kdiff3. > ( > http://stackoverflow.com/questions/16086484/conflict-when-merging-two-branch > es-with-git ) > > There fore I would need to run kdiff3 if my script detected conflicts. > Then kdiff3 would exit with code 0 (zero) if it has resolved > automatically the conflict and would exit with code other then 0 if it > could not resolved the conflict and then I have to resolve the conflict > manually. > > Is this kind of usage already possible? If not, is it planed to be > implemented? > > FYI: I'm new to kdiff3. > > Best regards, > Dritan > > ---------------------------------------------------------------------------- > -- Try New Relic Now & We'll Send You this Cool Shirt > New Relic is the only SaaS-based application performance monitoring service > that delivers powerful full stack analytics. Optimize and monitor your > browser, app, & servers with just a few lines of code. Try New Relic > and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr > _______________________________________________ > Kdiff3-user mailing list > Kdi...@li... > https://lists.sourceforge.net/lists/listinfo/kdiff3-user |
|
From: Dritan L. [M. IT] <dri...@mo...> - 2013-04-23 06:20:44
|
Hi, is there a possibility to run kdiff3 without KDE? I saw "kdiff3-qt" but I still can not run it on Debian Server. Why I need this? I have an automatic script to merge 2 different branches. When there is a conflict I get an email. Often there are conflicts which can be automatically resolved by kdiff3. ( http://stackoverflow.com/questions/16086484/conflict-when-merging-two-branches-with-git ) There fore I would need to run kdiff3 if my script detected conflicts. Then kdiff3 would exit with code 0 (zero) if it has resolved automatically the conflict and would exit with code other then 0 if it could not resolved the conflict and then I have to resolve the conflict manually. Is this kind of usage already possible? If not, is it planed to be implemented? FYI: I'm new to kdiff3. Best regards, Dritan |
|
From: Joachim E. <joa...@gm...> - 2013-01-18 20:42:51
|
Hi Douglas, Regarding 1, 2 and 3: Perhaps the directory comparison options "Trust the size and modification date" and "Trust the size" is what you want. If set then KDiff3 assume files are equal if sizes and dates are equal and avoids the longer binary comparison. In the result view the newer file is green and the older is red. For equal files both are green. Regarding 4: Comparing pictures would really be nice and a picture (difference) viewer is on my own wishlist... Regards, Joachim Am Freitag, 18. Januar 2013, 11:29:08 schrieb Douglas Kaynor: I would like to see more compare options. 1. Does the file exist or both sides? 2. Is the file size the same? 3. Is the file date(or dates) the same? 4. Other diffs? I would like to use kdiff for comparing long lists of binary file, such as mps and photo file. Based on the compare I could update the files.-- Douglas B Kaynor do...@ka... |
|
From: Neal B. <ndb...@gm...> - 2013-01-18 19:31:47
|
I think kdiff3 is the wrong tool for this. On Fri, Jan 18, 2013 at 2:29 PM, Douglas Kaynor <dbk...@gm...> wrote: > I would like to see more compare options. > 1. Does the file exist or both sides? > 2. Is the file size the same? > 3. Is the file date(or dates) the same? > 4. Other diffs? > > I would like to use kdiff for comparing long lists of binary file, such as > mps and photo file. Based on the compare I could update the files. > -- > Douglas B Kaynor > do...@ka... > > > ------------------------------------------------------------------------------ > Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and > much more. Get web development skills now with LearnDevNow - > 350+ hours of step-by-step video tutorials by Microsoft MVPs and experts. > SALE $99.99 this month only -- learn more at: > http://p.sf.net/sfu/learnmore_122812 > _______________________________________________ > Kdiff3-user mailing list > Kdi...@li... > https://lists.sourceforge.net/lists/listinfo/kdiff3-user > > |
|
From: Douglas K. <dbk...@gm...> - 2013-01-18 19:29:36
|
I would like to see more compare options. 1. Does the file exist or both sides? 2. Is the file size the same? 3. Is the file date(or dates) the same? 4. Other diffs? I would like to use kdiff for comparing long lists of binary file, such as mps and photo file. Based on the compare I could update the files. -- Douglas B Kaynor do...@ka... |
|
From: David B. <xe...@gm...> - 2012-12-28 12:37:08
|
Hi! Using http://garr.dl.sourceforge.net/project/kdiff3/kdiff3/0.9.97/KDiff3-64bit-Setup_0.9.97.exe on Windows 8 (the same happens on Windows 7 too) there is a problem when comparing two drive root folders from the context menu: - open Explorer, view My Computer (to list disk drives/volumes) - select two drives -right click, and select in the context menu Compare KDiff3 starts and gives an error dialog: --------------------------- File Open Error --------------------------- Opening of these files failed: - H:" I:" --------------------------- OK --------------------------- It appears there is some quoting or other problem when passing the arguments. Selecting the same root folder from within KDiff3 works fine. Regards, David |
|
From: Maurice v. d. P. <gri...@kf...> - 2012-12-20 13:05:29
|
On Wed, Dec 19, 2012 at 10:19:16PM +0100, Joachim Eibl wrote: > Please upgrade to 0.9.97. It should already be fixed. Ugh. I've been switching between kdiff3 0.9.95 & 0.9.97 and qt 4.6.3 & 4.8.4 so often that I missed that. Thanks anyway =) Maurice. -- Maurice van der Pot Gnome Planner Developer gri...@kf... http://live.gnome.org/Planner |
|
From: Joachim E. <joa...@gm...> - 2012-12-19 21:19:35
|
Hi Maurice, Are you still using 0.9.96? Please upgrade to 0.9.97. It should already be fixed. Best regards, Joachim |
|
From: Maurice v. d. P. <gri...@kf...> - 2012-12-19 11:48:51
|
Hi, I noticed that OptionDialog.cpp needs #include <QDir> in order to compile, otherwise it will fail with: optiondialog.cpp:1434: error: `QDir' undeclared (first use this function) Hth, Maurice. -- Maurice van der Pot Gnome Planner Developer gri...@kf... http://live.gnome.org/Planner |
|
From: Joachim E. <joa...@gm...> - 2012-09-21 21:05:48
|
Hi Christian, Thanks for reporting. I've now fixed it in the git repository. Best regards, Joachim Am Donnerstag, 20. September 2012, 12:46:07 schrieb cwlists: > Hi, > > KDiff3 0.9.97 seems to ignore the Directory / "Case sensitive filename > comparison" configuration setting and always do a case sensitive file > name comparison. It always treats file names with different > upper/lower cases as different files. > > This is on Windows 7, 64-bit. Tried with both the 32- and 64-bit version. > > If I uninstall and install the previous version 0.9.96 then this > setting works as it should. > > > Best Regards, > Christian |
|
From: cwlists <cw...@gm...> - 2012-09-20 10:46:16
|
Hi, KDiff3 0.9.97 seems to ignore the Directory / "Case sensitive filename comparison" configuration setting and always do a case sensitive file name comparison. It always treats file names with different upper/lower cases as different files. This is on Windows 7, 64-bit. Tried with both the 32- and 64-bit version. If I uninstall and install the previous version 0.9.96 then this setting works as it should. Best Regards, Christian |
|
From: Joachim E. <joa...@gm...> - 2012-08-15 16:06:48
|
> Kdiff3 looks completely broken on my OSX/macports QT4 setup right now, and > for some reason I thought I could try fixing it myself. https://sourceforge.net/tracker/?func=detail&aid=3557902&group_id=58666&atid=488548 This seems to be the same issue the Ubuntu people already reported. I am already working on that. > Before spending > time on this project I wanted to know how "sane" and "alive" it was, and > source control changelogs and diffs are a very good way to measure that. > Here things did not looked good and I was curious if it was you lacking > time or if it was deliberate, and if I would be wasting my time trying to > contribute here. Which does not seem the case. Lacking time. (A baby and a small child ...) And sometimes I'm also doing other things. But hey: Did you know? KDiff3 is now 10 years old. The first release was published on 2002-07-28. Time for a little celebration :-) > I have not looked at sourceforge git support but this is certainly a good > step forward. It will make it easier for you to just import patches with > commit logs etc. Yet I always wonder, why almost nobody wanted to get involved as a developer with direct access rights. I assume this is felt as a burden. > :-). - How easy it is to build/test. Basically, how good is the README. > Kdiff3 README is complete, but a little complicated. I would have expected > to have one way to build it for all platforms (with minor tweaks on Windows > as usual). Like cmake for everyone. Since Qt seems to be going in that direction too, your wish will come true. But I'm not so fluid in cmake. QMake is very easy for me. And Windows still requires special treatment for different compilers, 64 bit vs. 32 bit etc. > Maybe stress the KDE part a bit less. On Linux the configure script I wrote myself work quite well. Does it also work on OSX? > - Tests. No tests (or I missed them in the README and sources). Maurice van der Pot actually contributed an initial test suite (in 0.9.97). But of course more could be done. > - (Minor) Directory layout. The structure is not canonical for a subversion > project, it is kdiff3/trunk/kdiff3 instead of just kdiff3/trunk. Not a big > deal if you use subversion but complicates things if you use git or > mercurial on top of subversion. Yes. I will remove that extra kdiff3 subdirectory if its easy. > In 2012, sourceforge feels clunky and oldish. ... You are right about these aspects. Though at the moment I will still stick with sourceforge, but start with git. One change at the time ;-) Best regards, Joachim |
|
From: Patrick M. <pa...@me...> - 2012-08-15 12:55:55
|
Le 15/08/12 13:25, Joachim Eibl a écrit : > Hi Patrick, > >> Sorry if this is a little off-topic for the -user list but I could not find >> a development channel, please redirect me if there is a better place for >> this discussion. > > No problem. For a private discussion you might write to my email as shown on > the homepage without the "__NO_SPAM__" part. OK, I felt this kind of discussion about the project workflow should be public, just maybe not here. > About your remarks: It is good of you to point them out because I didn't look > at it that way. > > For the README file I applied the patches and noticed that there are more > things to fix and that's what I did, before I committed the changes. > > E.g. the GPL exception was only necessary for Qt3 where for some operating > systems (Windows) no GPL version was available. > >> I suppose the change itself is right, but I did not do it and it should not >> be attributed to me. It is usually accepted to tweak submissions to fix >> typos or whitespace damage but anything beyond this should at least be >> discussed with the submitter. I am perfectly fine with you rejecting my >> patch because of X and Y, talking about them and resubmitting, this is the >> contribution game. That way all what gets in actually comes from me. This >> is not a big deal with the "GPL extension" section I mentioned, but I am a >> little unhappy with... > > Completely understandable. I will be more careful about that in the future. One thing I forgot to mention is beyond the philosophical stance, contributions to free software projects are more and more linked to resume and part of a developer public profile. Accuracy and visibility of submissions are rewarding for the contributor (though in the case of my patches this is completely irrelevant :-)). >> 3- Why do you comment code instead of removing it? > > Because I intended to use it, but then it was not that easy as expected. Yet > otherwise you are right of course. Probably I should just remove such > commented out code and rely on version control to fetch it back if needed. This might also be subversion forcing the "commit is publishing" thing over you, with DVCS people would use private local branches for work in progress. > I wasn't aware that others were looking so closely at my code ;-) Kdiff3 looks completely broken on my OSX/macports QT4 setup right now, and for some reason I thought I could try fixing it myself. Before spending time on this project I wanted to know how "sane" and "alive" it was, and source control changelogs and diffs are a very good way to measure that. Here things did not looked good and I was curious if it was you lacking time or if it was deliberate, and if I would be wasting my time trying to contribute here. Which does not seem the case. And yes, I have to file a bug report about my problem first. >> Both way, it gives a feeling of uncertainty and confusion, it >> seems you do not know where things are going. > > The direction is much set by users. If some features or bugs don't make it, > then just due to lack of time on my side. There are so many things I'd like to > have in KDiff3 myself and don't get around to do them. > >> I hope you do not find these comments too irritating, I really appreciate >> kdiff3 and all the work you put in it, it is one few multiplatform, >> efficient visual diff tools and is pretty important in the source >> control/editing ecosystem. > Thanks. > >> But contributing is a bit difficult and >> unpleasant right now, and I prefer to talk about it rather than moving on. > Yes. I've now activated the git repository on sourceforge will use this in > future instead of subversion. Perhaps this will help. > If you have any concrete ideas, I'd like to know. I have not looked at sourceforge git support but this is certainly a good step forward. It will make it easier for you to just import patches with commit logs etc. Not sure I can suggest what to improve, but I can tell you what I look at before hacking on new projects: - How easy it is to get the sources. I am not a subversion hater, far from it, but really for open source projects, DVCS are a godsend. Cloning is usually fast, you get everything and once it is there you do not have to deal with anything else than the clone (no browsing web based changelogs for instance). You can run all kind of tools on this, bisect, etc... So +1 for git even if I am not a git fan myself :-). - How easy it is to build/test. Basically, how good is the README. Kdiff3 README is complete, but a little complicated. I would have expected to have one way to build it for all platforms (with minor tweaks on Windows as usual). Like cmake for everyone. Here you have a lengthy KDE section, then different instructions to build without KDE, for each platform. While historically all this comes from KDE, the project clearly moved beyond that, I use kdiff3 on Windows and OSX so. Maybe stress the KDE part a bit less. Anyway, it just *builds* and this is good. - Tests. No tests (or I missed them in the README and sources). Not much to suggest on the "how" side but there are certainly parts (merging/diffing routines) which could benefit from some automated testing. And probably way to automate GUI runs. - (Minor) Directory layout. The structure is not canonical for a subversion project, it is kdiff3/trunk/kdiff3 instead of just kdiff3/trunk. Not a big deal if you use subversion but complicates things if you use git or mercurial on top of subversion. >> (Note I did not say a word about sourceforge :-)). > Please give more info about what you mean by that. In 2012, sourceforge feels clunky and oldish. For instance, I was looking for a commit log browser and could not find it, only a subversion directory view with most recent commit attached to each file, which is completely useless. Notification emails are sent with no...@so... set both as sender and to, so you have to match the subject to write rules in email clients. The web based mailing list view is ackward to use. And so forth, a lot of small details telling its age. The forking/pulling workflows implemented by github or bitbucket may be compelling too. They are not perfect either. In the end you have to find a hosting solution matching the kind of workflow you want to implement for the project. Pasting diffs in webforms is a bit weird when you have git send-email, hg email or public forks, but experiences differ and your time is more precious than the one of your potential contributors at this point. Thank you for all your answers, I am glad the discussion is actually constructive. Now I have to stop talking and file this bug report. -- Patrick Mézard |
12 messages has been excluded from this view by a project administrator.
