Logo Khaganat

Wikhan

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
en:mercurial [2016/12/26 13:58] – Domperssen:mercurial [2021/12/03 18:19] (current) – external edit 127.0.0.1
Line 1: Line 1:
 ====== Mercurial ====== ====== Mercurial ======
  
-The Ryzom Core Game Server data is hosted on [[http://bitbucket.org/ryzom/ryzomcore|Bitbucket]], which uses the Mercurial repository. We currently use the [[git|git]] system via a local Gitlab instance. If you do not know the concepts(push, pull, clone), go to page [[en:principle_de_de_veloppement_sur_khaganat|how to retrieve data]]. +The Ryzom Core Game Server data is hosted on [[http://bitbucket.org/ryzom/ryzomcore|Bitbucket]], which uses the Mercurial repository. We currently use the [[git|git]] system via a local Gitlab instance. If you do not know the concepts(push, pull, clone), go to page [[en:principe_de_developpement_sur_khaganat |how to retrieve data]]. 
-{{ tuto_mercurial1.png?direct&200 |Website of Bitbucket}}+{{https://khaganat.net/wikhan/_media/fr:tuto_mercurial1.png |Website of Bitbucket}}
  
  
Line 26: Line 26:
 merge=meld merge=meld
 </code> </code>
-//[[http://www.nano-editor.org/|Nano]] and [[http://meldmerge.org/|Meld]] are only suggestions... Make also sure that you have the "two software" installed!+// [[http://www.nano-editor.org/|Nano]] and [[http://meldmerge.org/|Meld]] are only suggestions... Make also sure that you have the these two software's installed!
  
  
Line 33: Line 33:
 Cloning a repository to home folder: Cloning a repository to home folder:
   hg clone http://depots.khaganat.net/scm/hg/Fabrique   hg clone http://depots.khaganat.net/scm/hg/Fabrique
 +//
 // You can clone the first one to an second folder, in order to keep/compare the "server" version and versions in the course of work. This makes it possible to merge the differences more comfortably. // You can clone the first one to an second folder, in order to keep/compare the "server" version and versions in the course of work. This makes it possible to merge the differences more comfortably.
  
Line 65: Line 65:
   hg merge   hg merge
  
-In case of merge conflict, and once resolved:+In case of merge conflict, and to resolve:
   hg resolve -m file name   hg resolve -m file name
  
Line 73: Line 73:
   hg up   hg up
  
-There are also several methods to synchronize it's files with the master repository of the project, among which is distinguished as [[wpfr> wiki/TortoiseHg|TortoiseHg]], a graphical tool available in Windows and GNU/Linux (and soon Mac).+There are also several methods to synchronize it's files with the master repository of the project, among which is distinguished as [[wpfr> wiki/TortoiseHg|TortoiseHg]], a graphical tool available in Windows and GNU/Linux(and soon Mac).
  
 ===== Installation of Tortoise Hg ===== ===== Installation of Tortoise Hg =====
  
 It already exist in Debian binaries: //tortoisehg// and/or tortoisehg-nautilus//(depends on //Mercurial//). It already exist in Debian binaries: //tortoisehg// and/or tortoisehg-nautilus//(depends on //Mercurial//).
-\\ Otherwise you can find explanations on the [[http://tortoisehg.bitbucket.org/download/index.html] project download page]. +\\ Otherwise you can find explanations on the [[http://tortoisehg.bitbucket.org/download/index.html]] project download page]. 
 +//
 ===== Git ===== ===== Git =====
 Git is another version management system. It is used for Khaganat currently, knowing it can therefore prove useful. Git is another version management system. It is used for Khaganat currently, knowing it can therefore prove useful.
CC Attribution-Share Alike 4.0 International Driven by DokuWiki
en/mercurial.1482760726.txt.gz · Last modified: (external edit)
Licences Mentions légales Accueil du site Contact Inclusion