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 |