README_REPOSITORY
changeset 30182 db768c888dfa
parent 29481 3e8420c1124a
child 32361 141e5151b918
     1.1 --- a/README_REPOSITORY	Sat Feb 28 21:34:33 2009 +0100
     1.2 +++ b/README_REPOSITORY	Sun Mar 01 12:37:42 2009 +0100
     1.3 @@ -32,9 +32,9 @@
     1.4  Initial configuration
     1.5  ---------------------
     1.6  
     1.7 -Always use Mercurial version 1.0 or later, such as 1.0.1 or 1.0.2.
     1.8 +Always use Mercurial versions from the 1.0 or 1.1 branch, or later.
     1.9  The old 0.9.x versions do not work in a multi-user environment with
    1.10 -shared file spaces.
    1.11 +shared file spaces!
    1.12  
    1.13  
    1.14  The official Isabelle repository can be cloned like this:
    1.15 @@ -62,7 +62,8 @@
    1.16  
    1.17  In principle, user names can be chosen freely, but for longterm
    1.18  committers of the Isabelle repository the obvious choice is to keep
    1.19 -with the old CVS naming scheme.
    1.20 +with the old CVS naming scheme.  Others should use their regular "full
    1.21 +name"; including an email address is optional.
    1.22  
    1.23  
    1.24  There are other useful configuration to go into $HOME/.hgrc,
    1.25 @@ -135,6 +136,29 @@
    1.26    hg clone ssh://wenzelm@atbroy100//home/isabelle-repository/repos/isabelle
    1.27  
    1.28  
    1.29 +Simplified merges
    1.30 +-----------------
    1.31 +
    1.32 +The main idea of Mercurial is to let individual users produce
    1.33 +independent branches of development first, but merge with others
    1.34 +frequently.  The basic hg merge operation is more general than
    1.35 +required for the mode of operation with a shared pull/push area.  The
    1.36 +hg fetch extension accommodates this case nicely, automating trivial
    1.37 +merges and requiring manual intervention for actual conflicts only.
    1.38 +
    1.39 +The fetch extension can be configured via the user's ~/.hgrc like
    1.40 +this:
    1.41 +
    1.42 +  [extensions]
    1.43 +  hgext.fetch =
    1.44 +
    1.45 +  [defaults]
    1.46 +  fetch = -m "merged"
    1.47 +
    1.48 +Note that the potential for merge conflicts can be greatly reduced by
    1.49 +doing "hg fetch" before any starting local changes!
    1.50 +
    1.51 +
    1.52  Content discipline
    1.53  ------------------
    1.54  
    1.55 @@ -172,7 +196,9 @@
    1.56      Mercurial provides nice web presentation of incoming changes with
    1.57      a digest of log entries; this also includes RSS/Atom news feeds.
    1.58      Users should be aware that others will actually read what is
    1.59 -    written into log messages.
    1.60 +    written into log messages.  There are also add-on browsers,
    1.61 +    notably hgtk that is part of the TortoiseHg distribution and works
    1.62 +    for generic Python/GTk platforms.
    1.63  
    1.64      The usual changelog presentation style for the Isabelle repository
    1.65      admits log entries that consist of several lines, but without the
    1.66 @@ -194,6 +220,3 @@
    1.67  
    1.68  Needless to say, the results from the build process must not be added
    1.69  to the repository!
    1.70 -
    1.71 -
    1.72 -Makarius 30-Nov-2008