##// END OF EJS Templates
README tidy-up...
mpm@selenic.com -
r445:fe48ffa3 default
parent child Browse files
Show More
@@ -1,3 +1,5 b''
1 MERCURIAL QUICK-START
2
1 Setting up Mercurial:
3 Setting up Mercurial:
2
4
3 Note: some distributions fails to include bits of distutils by
5 Note: some distributions fails to include bits of distutils by
@@ -28,7 +30,7 b' Setting up Mercurial:'
28
30
29 Setting up a Mercurial project:
31 Setting up a Mercurial project:
30
32
31 $ cd linux/
33 $ cd project/
32 $ hg init # creates .hg
34 $ hg init # creates .hg
33 $ hg status # show changes between repo and working dir
35 $ hg status # show changes between repo and working dir
34 $ hg diff # generate a unidiff
36 $ hg diff # generate a unidiff
@@ -42,6 +44,7 b' Setting up a Mercurial project:'
42
44
43 Mercurial commands:
45 Mercurial commands:
44
46
47 $ hg help [command] # get online help
45 $ hg history # show changesets
48 $ hg history # show changesets
46 $ hg log Makefile # show commits per file
49 $ hg log Makefile # show commits per file
47 $ hg update # check out the tip revision
50 $ hg update # check out the tip revision
@@ -65,7 +68,7 b' Branching and merging:'
65 $ hg commit
68 $ hg commit
66 $ cd ../linux
69 $ cd ../linux
67 $ hg pull ../linux-work # pull changesets from linux-work
70 $ hg pull ../linux-work # pull changesets from linux-work
68 $ hg update # merge the new tip from linux-work into
71 $ hg update -m # merge the new tip from linux-work into
69 # our working directory
72 # our working directory
70
73
71 Importing patches:
74 Importing patches:
@@ -92,7 +95,7 b' Exporting a patch:'
92
95
93 Network support:
96 Network support:
94
97
95 # pull the self-hosting hg repo
98 # pull from the primary Mercurial repo
96 foo$ hg init
99 foo$ hg init
97 foo$ hg pull http://selenic.com/hg/
100 foo$ hg pull http://selenic.com/hg/
98 foo$ hg update # hg co works too
101 foo$ hg update # hg co works too
@@ -105,11 +108,11 b' Network support:'
105
108
106 # merge changes from a remote machine
109 # merge changes from a remote machine
107 bar$ hg pull http://foo/
110 bar$ hg pull http://foo/
108 bar$ hg co # merge changes into your working directory
111 bar$ hg update -m # merge changes into your working directory
109
112
110 # Set up a CGI server on your webserver
113 # Set up a CGI server on your webserver
111 foo$ cp hgweb.cgi ~/public_html/hg-linux/index.cgi
114 foo$ cp hgweb.cgi ~/public_html/hg/index.cgi
112 foo$ emacs ~/public_html/hg-linux/index.cgi # adjust the defaults
115 foo$ emacs ~/public_html/hg/index.cgi # adjust the defaults
113
116
114 Symbolic repository names:
117 Symbolic repository names:
115
118
@@ -118,5 +121,4 b' Symbolic repository names:'
118
121
119 [paths]
122 [paths]
120 main = http://selenic.com/hg
123 main = http://selenic.com/hg
121 hgweb = http://edge2.net/hg/hgweb/
124 linux = http://www.kernel.org/hg/
122 hgdoc = http://edge2.net/hg/man/
General Comments 0
You need to be logged in to leave comments. Login now