Skip to content
Snippets Groups Projects
Commit 5c331d94 authored by mpm's avatar mpm
Browse files

Update the README a bit

parent f9d8620e
No related branches found
No related tags found
No related merge requests found
...@@ -20,6 +20,5 @@ ...@@ -20,6 +20,5 @@
$ hg init # creates .hg $ hg init # creates .hg
$ hg status # show changes between repo and working dir $ hg status # show changes between repo and working dir
$ hg diff # generate a unidiff $ hg diff # generate a unidiff
$ hg export # export a changeset as a diff
$ hg addremove # add all unknown files and remove all missing files $ hg addremove # add all unknown files and remove all missing files
$ hg commit # commit all changes, edit changelog entry $ hg commit # commit all changes, edit changelog entry
...@@ -24,5 +23,6 @@ ...@@ -24,5 +23,6 @@
$ hg addremove # add all unknown files and remove all missing files $ hg addremove # add all unknown files and remove all missing files
$ hg commit # commit all changes, edit changelog entry $ hg commit # commit all changes, edit changelog entry
$ hg export # export a changeset as a diff
Mercurial will look for a file named .hgignore in the root of your Mercurial will look for a file named .hgignore in the root of your
repository contains a set of regular expressions to ignore in file repository contains a set of regular expressions to ignore in file
...@@ -33,9 +33,11 @@ ...@@ -33,9 +33,11 @@
$ hg history # show changesets $ hg history # show changesets
$ hg log Makefile # show commits per file $ hg log Makefile # show commits per file
$ hg checkout # check out the tip revision $ hg checkout # check out the tip revision
$ hg checkout <hash> # check out a specified changeset $ hg checkout <id> # check out a specified changeset
# IDs can be tags, revision numbers, or unique
# subsets of changeset hash numbers
$ hg add foo # add a new file for the next commit $ hg add foo # add a new file for the next commit
$ hg remove bar # mark a file as removed $ hg remove bar # mark a file as removed
$ hg verify # check repo integrity $ hg verify # check repo integrity
$ hg tags # show current tags $ hg tags # show current tags
$ hg annotate [files] # show changeset numbers for each file line $ hg annotate [files] # show changeset numbers for each file line
...@@ -37,9 +39,8 @@ ...@@ -37,9 +39,8 @@
$ hg add foo # add a new file for the next commit $ hg add foo # add a new file for the next commit
$ hg remove bar # mark a file as removed $ hg remove bar # mark a file as removed
$ hg verify # check repo integrity $ hg verify # check repo integrity
$ hg tags # show current tags $ hg tags # show current tags
$ hg annotate [files] # show changeset numbers for each file line $ hg annotate [files] # show changeset numbers for each file line
$ hg blame [files] # show commit users for each file line
Branching and merging: Branching and merging:
...@@ -69,10 +70,8 @@ ...@@ -69,10 +70,8 @@
Network support: Network support:
The simple way:
# pull the self-hosting hg repo # pull the self-hosting hg repo
foo$ hg init foo$ hg init
foo$ hg merge http://selenic.com/hg/ foo$ hg merge http://selenic.com/hg/
foo$ hg checkout # hg co works too foo$ hg checkout # hg co works too
...@@ -74,9 +73,9 @@ ...@@ -74,9 +73,9 @@
# pull the self-hosting hg repo # pull the self-hosting hg repo
foo$ hg init foo$ hg init
foo$ hg merge http://selenic.com/hg/ foo$ hg merge http://selenic.com/hg/
foo$ hg checkout # hg co works too foo$ hg checkout # hg co works too
# export your .hg directory as a directory on your webserver # export your current repo via HTTP with browsable interface
foo$ ln -s .hg ~/public_html/hg-linux foo$ hg serve -n "My repo" -p 80
# merge changes from a remote machine # merge changes from a remote machine
...@@ -82,5 +81,4 @@ ...@@ -82,5 +81,4 @@
# merge changes from a remote machine # merge changes from a remote machine
bar$ hg merge http://foo/~user/hg-linux bar$ hg merge hg://foo/
bar$ hg co # checkout the result
The new, fast, experimental way:
...@@ -86,6 +84,5 @@ ...@@ -86,6 +84,5 @@
# pull the self-hosting hg repo # Set up a CGI server on your webserver
foo$ hg init foo$ cp hgweb.cgi ~/public_html/hg-linux/index.cgi
foo$ hg merge hg://selenic.com/hg/ foo$ emacs ~/public_html/hg-linux/index.cgi # adjust the defaults
foo$ hg checkout # hg co works too
...@@ -91,12 +88,1 @@ ...@@ -91,12 +88,1 @@
# Set up the CGI server on your webserver
foo$ ln -s .hg ~/public_html/hg-linux/.hg
foo$ cp hgweb.py ~/public_html/hg-linux/index.cgi
# merge changes from a remote machine
bar$ hg merge hg://foo/~user/hg-linux
Another approach which does perform well right now is to use rsync.
Simply rsync the remote repo to a read-only local copy and then do a
local pull.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment