readme.txt
author Stephane Lenclud
Sat, 30 Jan 2016 23:01:51 +0100
branchMiniDisplay
changeset 454 f84878f52cd9
permissions -rw-r--r--
Disabling Nuvoton NCT6791D because of fan full speed bug on Asus Z97 WS.
     1 This repository was created from the trunk of Open Hardware Monitor using the Mercurial convert extension.
     2 
     3 The trunk of Open Hardware Monitor can be found there:
     4 http://open-hardware-monitor.googlecode.com/svn/trunk/
     5 
     6 The Mercurial convert extension documentation can be found there:
     7 http://mercurial.selenic.com/wiki/ConvertExtension
     8 
     9 'hg convert http://open-hardware-monitor.googlecode.com/svn/trunk/' generates a file named .hg/shamap
    10 This file is not synchronized with remote clones so we added it to the root of our repository on our 'MiniDisplay' branch.
    11 The trunk of Open Hardware Monitor is now the default branch of this repository.
    12 To fetch newer changes from the remote Open Hardware Monitor subversion depot one needs to:
    13  * Make sure the latest .hg/shamap is in place in your local clone.
    14  * Set default as the current branch.
    15  * Run 'hg convert http://open-hardware-monitor.googlecode.com/svn/trunk/'
    16  * Update shamap on the 'MiniDisplay' branch.
    17  
    18  Once the default branch is in sync you should be able to rebase or merge stuff into the 'MiniDisplay' branch.
    19  Though I'm not quite sure how to do that yet.