[kdiff3] [Bug 410962] kdiff3 vs svn (subversion)
https://bugs.kde.org/show_bug.cgi?id=410962 --- Comment #6 from Rob Brown --- I cloned and built. The resulting executable properly handles the -L options. Looks good. I'll look forward to this getting into the next release. Thanks. - - - Some off-topic observations: 1. The INSTALL file says "cmake && make". This didn't work for me. I eventually found that "cmake . && make" worked. 2. I have no idea if this is expected, or if it is my environment, but the "cmake . && make" command produced 1681 lines of output, including 218 warnings (apparently 1 from cmake and 217 from make) and 214 "... is deprecated". -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 410962] kdiff3 vs svn (subversion)
https://bugs.kde.org/show_bug.cgi?id=410962 michael changed: What|Removed |Added Latest Commit|https://invent.kde.org/kde/ |https://invent.kde.org/kde/ |kdiff3/commit/b7b2375c01b19 |kdiff3/commit/b4b2c97004b9d |ee1a1c49725fa28b0fa549156b4 |f2ad9807ba5ac00bb8f06958ce5 --- Comment #5 from michael --- Git commit b4b2c97004b9df2ad9807ba5ac00bb8f06958ce5 by Michael Reeves. Committed on 15/09/2019 at 22:58. Pushed by mreeves into branch '1.8'. Fix '-L' parameter handling FIXED-IN:1.8.2 M +1-1src/kdiff3.cpp M +1-1src/main.cpp https://invent.kde.org/kde/kdiff3/commit/b4b2c97004b9df2ad9807ba5ac00bb8f06958ce5 -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 410962] kdiff3 vs svn (subversion)
https://bugs.kde.org/show_bug.cgi?id=410962 michael changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED Latest Commit||https://invent.kde.org/kde/ ||kdiff3/commit/b7b2375c01b19 ||ee1a1c49725fa28b0fa549156b4 Version Fixed In||1.8.2 --- Comment #4 from michael --- Git commit b7b2375c01b19ee1a1c49725fa28b0fa549156b4 by Michael Reeves. Committed on 16/09/2019 at 00:05. Pushed by mreeves into branch 'master'. Fix '-L' parameter handling FIXED-IN:1.8.2 M +1-1src/kdiff3.cpp M +1-1src/main.cpp https://invent.kde.org/kde/kdiff3/commit/b7b2375c01b19ee1a1c49725fa28b0fa549156b4 -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 410962] kdiff3 vs svn (subversion)
https://bugs.kde.org/show_bug.cgi?id=410962 --- Comment #3 from michael --- Looks I made mistake in translating to QCommandLineParser's API. Will push a fix shortly. -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 410962] kdiff3 vs svn (subversion)
https://bugs.kde.org/show_bug.cgi?id=410962 michael changed: What|Removed |Added Status|REPORTED|ASSIGNED Ever confirmed|0 |1 -- You are receiving this mail because: You are watching all bug changes.
[kdiff3] [Bug 410962] kdiff3 vs svn (subversion)
https://bugs.kde.org/show_bug.cgi?id=410962
--- Comment #2 from Turtle ---
I did some poking around and this is defiantly something to do with the newer
QT port.
In main.cpp just after
initialiseCmdLineArgs(cmdLineParser);
// ignorable command options
There are some calls like:
cmdLineParser->addOption(QCommandLineOption(QStringList() <<
QLatin1String("m") << QLatin1String("merge"), i18n("Merge the input.")));
Then some calls to add the files:
cmdLineParser->addPositionalArgument(QLatin1String("[File1]"), i18n("file1
to open (base, if not specified via --base)"));
cmdLineParser->addPositionalArgument(QLatin1String("[File2]"), i18n("file2
to open"));
cmdLineParser->addPositionalArgument(QLatin1String("[File3]"), i18n("file3
to open"));
However the options seem to be clobbering the files, so my guess is another
cmdLineParser needs to loop for every option that == 'L'
--
You are receiving this mail because:
You are watching all bug changes.
[kdiff3] [Bug 410962] kdiff3 vs svn (subversion)
https://bugs.kde.org/show_bug.cgi?id=410962 Turtle changed: What|Removed |Added Version|1.7.90 |1.8.x CC||tur...@think-electric.com --- Comment #1 from Turtle --- I can confirm this bug in 1.8, as a workaround call this shell script from svn. #!/bin/sh kdiff3 --base "$6" "$7" --output "$7" -- You are receiving this mail because: You are watching all bug changes.
