# HG changeset patch # User mpm@selenic.com # Date 2005-06-23 21:48:06 # Node ID fe48ffa3665f7f6c90616bcc8b7199dc1534287f # Parent 2cdcb4beecb2eed9ba73882c7dc7f459b61d79b5 README tidy-up -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 README tidy-up manifest hash: 3093d78dfb6ba9ce83ae96d0a04ad5351b3088af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuy4WywK+sNU5EO8RAiwBAJ46tZBe1PLzKM+e70rdEF7wYtVrwgCfZoeo Gjt1DE0ZxkSFyWW5erIqyfI= =xF6B -----END PGP SIGNATURE----- diff --git a/README b/README --- a/README +++ b/README @@ -1,3 +1,5 @@ +MERCURIAL QUICK-START + Setting up Mercurial: Note: some distributions fails to include bits of distutils by @@ -28,7 +30,7 @@ Setting up Mercurial: Setting up a Mercurial project: - $ cd linux/ + $ cd project/ $ hg init # creates .hg $ hg status # show changes between repo and working dir $ hg diff # generate a unidiff @@ -42,6 +44,7 @@ Setting up a Mercurial project: Mercurial commands: + $ hg help [command] # get online help $ hg history # show changesets $ hg log Makefile # show commits per file $ hg update # check out the tip revision @@ -65,7 +68,7 @@ Branching and merging: $ hg commit $ cd ../linux $ hg pull ../linux-work # pull changesets from linux-work - $ hg update # merge the new tip from linux-work into + $ hg update -m # merge the new tip from linux-work into # our working directory Importing patches: @@ -92,7 +95,7 @@ Exporting a patch: Network support: - # pull the self-hosting hg repo + # pull from the primary Mercurial repo foo$ hg init foo$ hg pull http://selenic.com/hg/ foo$ hg update # hg co works too @@ -105,11 +108,11 @@ Network support: # merge changes from a remote machine bar$ hg pull http://foo/ - bar$ hg co # merge changes into your working directory + bar$ hg update -m # merge changes into your working directory # Set up a CGI server on your webserver - foo$ cp hgweb.cgi ~/public_html/hg-linux/index.cgi - foo$ emacs ~/public_html/hg-linux/index.cgi # adjust the defaults + foo$ cp hgweb.cgi ~/public_html/hg/index.cgi + foo$ emacs ~/public_html/hg/index.cgi # adjust the defaults Symbolic repository names: @@ -118,5 +121,4 @@ Symbolic repository names: [paths] main = http://selenic.com/hg - hgweb = http://edge2.net/hg/hgweb/ - hgdoc = http://edge2.net/hg/man/ + linux = http://www.kernel.org/hg/