Mercurial > hg > mercurial-crew-with-dirclash
comparison README @ 3692:49136e90517b
Merge with crew
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 20 Nov 2006 13:06:04 -0800 |
parents | 25e549e9b7d0 |
children | 048e9bc5cdc2 |
comparison
equal
deleted
inserted
replaced
3691:79151c94c3b4 | 3692:49136e90517b |
---|---|
74 | 74 |
75 # pull from the primary Mercurial repo | 75 # pull from the primary Mercurial repo |
76 foo$ hg clone http://selenic.com/hg/ | 76 foo$ hg clone http://selenic.com/hg/ |
77 foo$ cd hg | 77 foo$ cd hg |
78 | 78 |
79 # export your current repo via HTTP with browsable interface | 79 # make your current repo available via http://server:8000/ |
80 foo$ hg serve -n "My repo" -p 80 | 80 foo$ hg serve |
81 | 81 |
82 # pushing changes to a remote repo with SSH | 82 # pushing and pulling changes to/from a remote repo with SSH |
83 foo$ hg push ssh://user@example.com/~/hg/ | 83 foo$ hg push ssh://user@example.com/my/repository |
84 foo$ hg pull ssh://user@example.com//home/somebody/his/repository | |
84 | 85 |
85 # merge changes from a remote machine | 86 # merge changes from a remote machine (e.g. running 'hg serve') |
86 bar$ hg pull http://foo/ | 87 bar$ hg pull http://foo:8000/ |
87 bar$ hg merge # merge changes into your working directory | 88 bar$ hg merge # merge changes into your working directory |
89 bar$ hg commit # commit merge in to your local repository | |
88 | 90 |
89 # Set up a CGI server on your webserver | 91 # Set up a CGI server on your webserver |
90 foo$ cp hgweb.cgi ~/public_html/hg/index.cgi | 92 foo$ cp hgweb.cgi ~/public_html/hg/index.cgi |
91 foo$ emacs ~/public_html/hg/index.cgi # adjust the defaults | 93 foo$ emacs ~/public_html/hg/index.cgi # adjust the defaults |
92 | 94 |