##// END OF EJS Templates
Tweak README for branch, push, and .hgrc...
mpm@selenic.com -
r327:a9ad98a9 default
parent child Browse files
Show More
@@ -59,7 +59,7 b' Branching and merging:'
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
@@ -100,6 +100,9 b' Network support:'
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
@@ -110,10 +113,10 b' Network support:'
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/
General Comments 0
You need to be logged in to leave comments. Login now