Mercurial > hg
diff README @ 3689:25e549e9b7d0
Improved examples for network support in README.
- Simplified 'hg serve' example, -p80 needs root anyway.
- Example for ssh:// with relative or absolute path.
- merges need to be committed.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 20 Nov 2006 21:03:02 +0100 |
| parents | 72efff4be2ad |
| children | 048e9bc5cdc2 |
line wrap: on
line diff
--- a/README Mon Nov 20 19:55:59 2006 +0100 +++ b/README Mon Nov 20 21:03:02 2006 +0100 @@ -76,15 +76,17 @@ foo$ hg clone http://selenic.com/hg/ foo$ cd hg - # export your current repo via HTTP with browsable interface - foo$ hg serve -n "My repo" -p 80 + # make your current repo available via http://server:8000/ + foo$ hg serve - # pushing changes to a remote repo with SSH - foo$ hg push ssh://user@example.com/~/hg/ + # pushing and pulling changes to/from a remote repo with SSH + foo$ hg push ssh://user@example.com/my/repository + foo$ hg pull ssh://user@example.com//home/somebody/his/repository - # merge changes from a remote machine - bar$ hg pull http://foo/ + # merge changes from a remote machine (e.g. running 'hg serve') + bar$ hg pull http://foo:8000/ bar$ hg merge # merge changes into your working directory + bar$ hg commit # commit merge in to your local repository # Set up a CGI server on your webserver foo$ cp hgweb.cgi ~/public_html/hg/index.cgi