Mercurial > hg > mercurial-crew-with-dirclash

comparison README @ 327:a9ad98a9c9bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tweak README for branch, push, and .hgrc -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Tweak README for branch, push, and .hgrc manifest hash: f1937ad49013e7e40e6555f2acf1210563e6a96d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCrhBSywK+sNU5EO8RAr0OAJ9T+DcMcIvXp9ajI46kXM40GuHosgCfRxfY 8uhwZqdaR0JWlWff0nC6t1Y= =3I60 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Mon, 13 Jun 2005 15:01:38 -0800
parents 3dae0296551d
children 27d08c0c2a7e
comparison
equal deleted inserted replaced
326:235443668bea 327:a9ad98a9c9bc
57 Branching and merging: 57 Branching and merging:
58 58
59 $ cd .. 59 $ cd ..
60 $ mkdir linux-work 60 $ mkdir linux-work
61 $ cd linux-work 61 $ cd linux-work
62 $ hg branch ../linux # create a new branch 62 $ hg init ../linux # create a new branch
63 $ hg update # populate the working directory 63 $ hg update # populate the working directory
64 $ <make changes> 64 $ <make changes>
65 $ hg commit 65 $ hg commit
66 $ cd ../linux 66 $ cd ../linux
67 $ hg pull ../linux-work # pull changesets from linux-work 67 $ hg pull ../linux-work # pull changesets from linux-work
98 foo$ hg update # hg co works too 98 foo$ hg update # hg co works too
99 99
100 # export your current repo via HTTP with browsable interface 100 # export your current repo via HTTP with browsable interface
101 foo$ hg serve -n "My repo" -p 80 101 foo$ hg serve -n "My repo" -p 80
102 102
103 # pushing changes to a remote repo with SSH
104 foo$ hg push ssh://user@example.com/~/hg/
105
103 # merge changes from a remote machine 106 # merge changes from a remote machine
104 bar$ hg pull http://foo/ 107 bar$ hg pull http://foo/
105 bar$ hg co # merge changes into your working directory 108 bar$ hg co # merge changes into your working directory
106 109
107 # Set up a CGI server on your webserver 110 # Set up a CGI server on your webserver
108 foo$ cp hgweb.cgi ~/public_html/hg-linux/index.cgi 111 foo$ cp hgweb.cgi ~/public_html/hg-linux/index.cgi
109 foo$ emacs ~/public_html/hg-linux/index.cgi # adjust the defaults 112 foo$ emacs ~/public_html/hg-linux/index.cgi # adjust the defaults
110 113
111 Symbolic repository names: 114 Symbolic repository names:
112 115
113 Mercurial uses an optional file called ~/.hgpaths to track repo 116 Mercurial uses an options file called ~/.hgrc. To track locations
114 locations symbolically. Simply add a line with the name, a space, and 117 symbolically, add a section to it like this:
115 a URL:
116 118
117 foo$ echo "main http://selenic.com/hg/" >> ~/.hgpaths 119 [paths]
118 foo$ hg merge main 120 main = http://selenic.com/hg
119 foo$ hg co 121 hgweb = http://edge2.net/hg/hgweb/
122 hgdoc = http://edge2.net/hg/man/