equal
deleted
inserted
replaced
77 |
77 |
78 # export your current repo via HTTP with browsable interface |
78 # export your current repo via HTTP with browsable interface |
79 foo$ hg serve -n "My repo" -p 80 |
79 foo$ hg serve -n "My repo" -p 80 |
80 |
80 |
81 # merge changes from a remote machine |
81 # merge changes from a remote machine |
82 bar$ hg merge hg://foo/ |
82 bar$ hg merge http://foo/ |
83 bar$ hg co # checkout the result |
83 bar$ hg co # checkout the result |
84 |
84 |
85 # Set up a CGI server on your webserver |
85 # Set up a CGI server on your webserver |
86 foo$ cp hgweb.cgi ~/public_html/hg-linux/index.cgi |
86 foo$ cp hgweb.cgi ~/public_html/hg-linux/index.cgi |
87 foo$ emacs ~/public_html/hg-linux/index.cgi # adjust the defaults |
87 foo$ emacs ~/public_html/hg-linux/index.cgi # adjust the defaults |