Topic: Diff ?

@scoripio810

Comment créer un fichier diff et composé de plusieurs fichiers?

How does one make a diff file and consists of several files?

dans le terminal
Terminal mode ?

Cordialement
With best regards
Erik

  • scorpio810
  • scorpio810
  • QElectroTech Team Manager, Developer, Packager
  • Offline

Re: Diff ?

Hi Erik,
see my post here :

https://qelectrotech.org/forum/viewtopi … 9115#p9115 

Re: Diff ?

Hi Laurent,

You misunderstood me.
How did you create this file grid.diff. ?
This contains various files.
Can you explain how you did this.


Tu m'as mal compris.
Comment avez-vous créé ce fichier grid.diff. ?
Cela contient divers fichiers.
Pouvez-vous expliquer comment vous avez fait cela?


Erik

  • scorpio810
  • scorpio810
  • QElectroTech Team Manager, Developer, Packager
  • Offline

Re: Diff ?

Hi Erik,

I just add your files to my Subversion local directory and overwrite them,
after i just did a svn diff > grid.diff command in terminal.




If you want try patch add grid.diff in sources directory and use svn patch grid.diff command in terminal.

You can make the same thing in qtcreator -> Go to Tools -> Subversion -> Diff project "qelectrotech"  

Re: Diff ?

Hi laurent,

In qtcreator tools menu have I not Subversion.

Erik

  • scorpio810
  • scorpio810
  • QElectroTech Team Manager, Developer, Packager
  • Offline

Re: Diff ?

See my notes here :
https://qelectrotech.org/wiki_new/doc/qt_creator 

  • scorpio810
  • scorpio810
  • QElectroTech Team Manager, Developer, Packager
  • Offline

Re: Diff ?

In qtcreator go to Tools -> Version control, open Subversion tab, add  /usr/bin/svn in command field (for Debian like).

Re: Diff ?

Bonjour,

Bonjour
Ne pas avoir le menu SVN , mais svn est installé.

Hello,
Do not have SVN in tools menu, but svn is installed.

Post's attachments

Qtcreator-Diff.JPG, 30.66 kb, 840 x 525
Qtcreator-Diff.JPG 30.66 kb, 317 downloads since 2019-02-16 

Re: Diff ?

Bonjour,
Je suis avez des problèmes pour installer le fichier patch

Hello,
Have problems installing the patch file

Post's attachments

SVN patch-0001.JPG, 19.32 kb, 840 x 525
SVN patch-0001.JPG 19.32 kb, 307 downloads since 2019-02-16 

  • scorpio810
  • scorpio810
  • QElectroTech Team Manager, Developer, Packager
  • Offline

Re: Diff ?

Get latest sources by :

svn checkout svn://svn.tuxfamily.org/svnroot/qet/qet/trunk trunk

Now you can create new qtcreator project ->  select your path to your folder -> trunk/qelectrotech.pro

If you want to apply a patch :
Go to your trunk folder and add patch file.
Apply patch command in terminal ;

svn patch  your patch_file.diff

Run qtcreator and recompile sources.

Re: Diff ?

Bedankt.
Het probleem was dat het programma git niet was geinstalleerd.
In qtcreator krijg ik nu ook subversion te zien.

Merci Laurent,
Le problème était que le programme git n'était pas installé.nomicons/angry
Dans qtcreator, je vois maintenant aussi la subversion.nomicons/smile

ThanksLaurent,
The problem was that the program git was not installed.
In qtcreator I now also see subversion.

Erik

  • scorpio810
  • scorpio810
  • QElectroTech Team Manager, Developer, Packager
  • Offline

Re: Diff ?

nomicons/smile