README_REPOSITORY
changeset 47449 5e1482296b12
parent 40601 021278fdd0a8
child 48497 ba61aceaa18a
     1.1 --- a/README_REPOSITORY	Fri Apr 13 09:17:01 2012 +0200
     1.2 +++ b/README_REPOSITORY	Fri Apr 13 12:09:25 2012 +0200
     1.3 @@ -32,10 +32,9 @@
     1.4  
     1.5  Mercurial provides nice web presentation of incoming changes with a
     1.6  digest of log entries; this also includes RSS/Atom news feeds.  There
     1.7 -are add-on browsers, notably hgtk that is part of the TortoiseHg
     1.8 -distribution and works for generic Python/GTk platforms.  The
     1.9 -alternative "view" utility helps to inspect the semantic content of
    1.10 -merge nodes.
    1.11 +are add-on history browsers such as "hg view" and TortoiseHg.  Unlike
    1.12 +the default web view, some of these tools help to inspect the semantic
    1.13 +content of non-trivial merge nodes.
    1.14  
    1.15  
    1.16  Initial configuration
    1.17 @@ -107,27 +106,27 @@
    1.18  time of writing and many years later.
    1.19  
    1.20  Push access to the Isabelle repository requires an account at TUM,
    1.21 -with properly configured ssh to the local machines (e.g. macbroy20,
    1.22 -atbroy100).  You also need to be a member of the "isabelle" Unix
    1.23 +with properly configured ssh to the local machines (e.g. macbroy20 ..
    1.24 +macbroy29).  You also need to be a member of the "isabelle" Unix
    1.25  group.
    1.26  
    1.27  Sharing a locally modified clone then works as follows, using your
    1.28  user name instead of "wenzelm":
    1.29  
    1.30 -  hg out ssh://wenzelm@atbroy100//home/isabelle-repository/repos/isabelle
    1.31 +  hg out ssh://wenzelm@macbroy20//home/isabelle-repository/repos/isabelle
    1.32  
    1.33  In fact, the "out" or "outgoing" command performs only a dry run: it
    1.34  displays the changesets that would get published.  An actual "push",
    1.35  with a lasting effect on the Isabelle repository, works like this:
    1.36  
    1.37 -  hg push ssh://wenzelm@atbroy100//home/isabelle-repository/repos/isabelle
    1.38 +  hg push ssh://wenzelm@macbroy20//home/isabelle-repository/repos/isabelle
    1.39  
    1.40  
    1.41  Default paths for push and pull can be configured in
    1.42  isabelle/.hg/hgrc, for example:
    1.43  
    1.44    [paths]
    1.45 -  default = ssh://wenzelm@atbroy100//home/isabelle-repository/repos/isabelle
    1.46 +  default = ssh://wenzelm@macbroy20//home/isabelle-repository/repos/isabelle
    1.47  
    1.48  Now "hg pull" or "hg push" will use that shared file space, unless a
    1.49  different URL is specified explicitly.
    1.50 @@ -136,7 +135,7 @@
    1.51  source URL.  So we could have cloned via that ssh URL in the first
    1.52  place, to get exactly to the same point:
    1.53  
    1.54 -  hg clone ssh://wenzelm@atbroy100//home/isabelle-repository/repos/isabelle
    1.55 +  hg clone ssh://wenzelm@macbroy20//home/isabelle-repository/repos/isabelle
    1.56  
    1.57  
    1.58  Simple merges