Re: [Kdiff3-user] Running kdiff3 without KDE

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

<html><head></head><body><div style="font-family: Verdana;font-size: 12.0px;"><div>
<div>Hi Dritan,</div>

<div>&nbsp;</div>

<div>The kdiff3-qt package also provides a binary &quot;/usr/bin/kdiff3&quot;. So it conflicts with the default package and only one can be installed at the same time.</div>

<div>So running &quot;kdiff3&quot; is correct.</div>

<div>&nbsp;</div>

<div>If it can&#39;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>&nbsp;</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>&nbsp;</div>

<div>Joachim</div>

<div>&nbsp;
<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;">Gesendet:&nbsp;Mittwoch, 24. April 2013 um 07:45 Uhr 
Von:&nbsp;&quot;Dritan Latifi [Motrada IT]&quot; &lt;dri...@mo...&gt; 
An:&nbsp;&quot;Joachim Eibl&quot; &lt;joa...@gm...&gt; 
Betreff:&nbsp;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, 
 
thanks for your answer. 
 
 
&gt; 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. 
&gt; If it is not installed try &quot;sudo apt-get install kdiff3-qt&quot;. 
 
1. :~&#36; apt-get install kdiff3-qt 
Reading package lists... Done 
Building dependency tree&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
Reading state information... Done 
kdiff3-qt is already the newest version. 
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. 
2. :~&#36; kdiff3 
kdiff3: cannot connect to X server 
:~&#36; kdiff3-qt 
&nbsp;-bash: kdiff3-qt: command not found 
 
&gt; 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. 
&nbsp; 
What kind of user interaction is needed on exit code 1 if KDiff3 runs without KDE? 
 
&gt; Currently it is not possible that KDiff3 will automatically exit if conflicts cannot be solved automatically. 
 
Pity that is not possible.&nbsp; 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:</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>&nbsp;</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>

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 style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">If it is not installed try &quot;sudo apt-get install kdiff3-qt&quot;.</p>

<p>&nbsp;</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 &quot;--auto&quot; 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>&nbsp;</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>&nbsp;</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>&nbsp;</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>&nbsp;</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>&nbsp;</p>

<p>&nbsp;</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;">&gt; Hi,</p>

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt;</p>

&gt; is there a possibility to run kdiff3 without KDE? I saw &quot;kdiff3-qt&quot; but

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt; 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;">&gt;</p>

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt; Why I need this?</p>

&gt; I have an automatic script to merge 2 different branches. When there is

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt; 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;">&gt; 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;">&gt; (</p>

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt; <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;">&gt; es-with-git )</p>

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt;</p>

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt; 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;">&gt; 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;">&gt; 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;">&gt; 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;">&gt; manually.</p>

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt;</p>

&gt; Is this kind of usage already possible? If not, is it planed to be

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt; implemented?</p>

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt;</p>

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt; FYI: I&#39;m new to kdiff3.</p>

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt;</p>

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt; Best regards,</p>

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt; Dritan</p>

<p style="margin-top: 0.0px;margin-bottom: 0.0px;margin-left: 0.0px;margin-right: 0.0px;">&gt;</p>
</blockquote>
</div>
</div>
</div>
</div>
</div></div></body></html>

Re: [Kdiff3-user] Running kdiff3 without KDE

A graphical text difference analyzer

Re: [Kdiff3-user] Running kdiff3 without KDE