readme.txt
author StephaneLenclud
Mon, 02 Feb 2015 21:06:44 +0100
branchMiniDisplay
changeset 449 b3792b2fe742
permissions -rw-r--r--
Solution Build Config update.
StephaneLenclud@448
     1
This repository was created from the trunk of Open Hardware Monitor using the Mercurial convert extension.
StephaneLenclud@448
     2
StephaneLenclud@448
     3
The trunk of Open Hardware Monitor can be found there:
StephaneLenclud@448
     4
http://open-hardware-monitor.googlecode.com/svn/trunk/
StephaneLenclud@448
     5
StephaneLenclud@448
     6
The Mercurial convert extension documentation can be found there:
StephaneLenclud@448
     7
http://mercurial.selenic.com/wiki/ConvertExtension
StephaneLenclud@448
     8
StephaneLenclud@448
     9
'hg convert http://open-hardware-monitor.googlecode.com/svn/trunk/' generates a file named .hg/shamap
StephaneLenclud@448
    10
This file is not synchronized with remote clones so we added it to the root of our repository on our 'MiniDisplay' branch.
StephaneLenclud@448
    11
The trunk of Open Hardware Monitor is now the default branch of this repository.
StephaneLenclud@448
    12
To fetch newer changes from the remote Open Hardware Monitor subversion depot one needs to:
StephaneLenclud@448
    13
 * Make sure the latest .hg/shamap is in place in your local clone.
StephaneLenclud@448
    14
 * Set default as the current branch.
StephaneLenclud@448
    15
 * Run 'hg convert http://open-hardware-monitor.googlecode.com/svn/trunk/'
StephaneLenclud@448
    16
 * Update shamap on the 'MiniDisplay' branch.
StephaneLenclud@448
    17
 
StephaneLenclud@448
    18
 Once the default branch is in sync you should be able to rebase or merge stuff into the 'MiniDisplay' branch.
StephaneLenclud@448
    19
 Though I'm not quite sure how to do that yet.