Mercurial > hg-stable
changeset 3692:49136e90517b
Merge with crew
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Mon, 20 Nov 2006 13:06:04 -0800 |
| parents | 79151c94c3b4 (current diff) 97d2c1909f98 (diff) |
| children | 454b3a8cdf28 |
| files | hgext/mq.py |
| diffstat | 2 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/README Mon Nov 20 13:03:52 2006 -0800 +++ b/README Mon Nov 20 13:06:04 2006 -0800 @@ -76,15 +76,17 @@ foo$ hg clone http://selenic.com/hg/ foo$ cd hg - # export your current repo via HTTP with browsable interface - foo$ hg serve -n "My repo" -p 80 + # make your current repo available via http://server:8000/ + foo$ hg serve - # pushing changes to a remote repo with SSH - foo$ hg push ssh://user@example.com/~/hg/ + # pushing and pulling changes to/from a remote repo with SSH + foo$ hg push ssh://user@example.com/my/repository + foo$ hg pull ssh://user@example.com//home/somebody/his/repository - # merge changes from a remote machine - bar$ hg pull http://foo/ + # merge changes from a remote machine (e.g. running 'hg serve') + bar$ hg pull http://foo:8000/ bar$ hg merge # merge changes into your working directory + bar$ hg commit # commit merge in to your local repository # Set up a CGI server on your webserver foo$ cp hgweb.cgi ~/public_html/hg/index.cgi
--- a/hgext/mq.py Mon Nov 20 13:03:52 2006 -0800 +++ b/hgext/mq.py Mon Nov 20 13:06:04 2006 -0800 @@ -2129,10 +2129,10 @@ "^qrefresh": (refresh, [('e', 'edit', None, _('edit commit message')), - ('m', 'message', '', _('change commit message with <text>')), - ('l', 'logfile', '', _('change commit message with <file> content')), + ('m', 'message', '', _('change commit message to <text>')), + ('l', 'logfile', '', _('change commit message to <file> content')), ('g', 'git', None, _('use git extended diff format')), - ('s', 'short', None, 'short refresh'), + ('s', 'short', None, 'refresh only files already in the patch'), ('I', 'include', [], _('include names matching the given patterns')), ('X', 'exclude', [], _('exclude names matching the given patterns'))], 'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] FILES...'),