A Scalable, User-Friendly Source Control System.
Go to file
Brendan Cully 7601c19932 Teach import to understand git diff extensions.
Vanilla patch chokes on git patches that include files that are copied
or renamed, then modified. So this code detects that case and rewrites
the patch if necessary.
2006-08-11 15:50:07 -07:00
contrib hgcommand.vim: requirements & doc self-install more consistent; cosmetics 2006-08-02 00:20:28 +02:00
doc Adjusted documentation for hgrc's "[smtp] host" for change in e579f762cc2a. 2006-08-11 09:11:54 +02:00
hgext mq: only add mq attribute to local repo 2006-08-10 17:33:08 -07:00
mercurial Teach import to understand git diff extensions. 2006-08-11 15:50:07 -07:00
templates [hgweb] links to shortlog for the default templates 2006-07-26 20:57:00 -04:00
tests fix test output 2006-08-10 17:37:57 -07:00
.hgignore Reorganized files in hg-purge repo to push them into Mercurial. 2006-06-01 23:58:06 +02:00
.hgsigs Added signature for changeset 4920307d90127e0e067420457dc7bad2fb652817 2006-07-24 17:17:07 -05:00
comparison.txt Cleanup of tabs and trailing spaces. 2005-09-21 07:56:19 +02:00
CONTRIBUTORS Add self to CONTRIBUTORS 2006-04-30 18:52:34 +02:00
COPYING Add COPYING 2005-06-17 09:32:13 -08:00
hg Update copyright notice 2006-02-05 22:21:02 -06:00
hgeditor Run commit message editor in the repo root (like hooks). 2006-02-09 07:01:23 +01:00
hgmerge Try to use /usr/bin/test or /bin/test to work around missing features. 2006-04-07 22:31:54 +02:00
hgweb.cgi This patch make several WSGI related alterations. 2006-06-27 00:09:33 -07:00
hgwebdir.cgi This patch make several WSGI related alterations. 2006-06-27 00:09:33 -07:00
Makefile Backed out changeset cec70ece11095d46f137b8447968d1a9af40766f 2006-07-27 18:53:10 +02:00
MANIFEST.in MANIFEST.in fixes 2006-07-27 12:33:33 +02:00
notes.txt deprecate undo command, replace with rollback command. 2006-05-08 14:19:05 -07:00
README Reorganized files in hg-purge repo to push them into Mercurial. 2006-06-01 23:58:06 +02:00
rewrite-log Simple script to recompress a log file 2005-05-23 16:06:25 -08:00
setup.py packagescan can't scan nested packages 2006-06-02 16:19:47 +09:00

MERCURIAL QUICK-START

Setting up Mercurial:

 Note: some distributions fails to include bits of distutils by
 default, you'll need python-dev to install. You'll also need a C
 compiler and a 3-way merge tool like merge, tkdiff, or kdiff3.

 First, unpack the source:

 $ tar xvzf mercurial-<ver>.tar.gz
 $ cd mercurial-<ver>

 When installing, change python to python2.3 or python2.4 if 2.2 is the
 default on your system.

 To install system-wide:

 $ python setup.py install --force

 To install in your home directory (~/bin and ~/lib, actually), run:

 $ python setup.py install --home=${HOME} --force
 $ export PYTHONPATH=${HOME}/lib/python  # (or lib64/ on some systems)
 $ export PATH=${HOME}/bin:$PATH         # add these to your .bashrc

 And finally:

 $ hg                                    # test installation, show help

 If you get complaints about missing modules, you probably haven't set
 PYTHONPATH correctly.

Setting up a Mercurial project:

 $ hg init project     # creates project directory
 $ cd project
                       # copy files in, edit them
 $ hg add              # add all unknown files
 $ hg remove --after   # remove deleted files
 $ hg commit           # commit all changes, edit changelog entry

 Mercurial will look for a file named .hgignore in the root of your
 repository which contains a set of regular expressions to ignore in
 file paths.

Branching and merging:

 $ hg clone linux linux-work    # create a new branch
 $ cd linux-work
 $ <make changes>
 $ hg commit
 $ cd ../linux
 $ hg pull ../linux-work     # pull changesets from linux-work
 $ hg merge                  # merge the new tip from linux-work into
                             # our working directory
 $ hg commit                 # commit the result of the merge

Importing patches:

 Fast:
 $ patch < ../p/foo.patch
 $ hg commit -A

 Faster:
 $ patch < ../p/foo.patch
 $ hg commit `lsdiff -p1 ../p/foo.patch`

 Fastest:
 $ cat ../p/patchlist | xargs hg import -p1 -b ../p

Exporting a patch:

 (make changes)
 $ hg commit
 $ hg tip
 28237:747a537bd090880c29eae861df4d81b245aa0190
 $ hg export 28237 > foo.patch    # export changeset 28237

Network support:

 # pull from the primary Mercurial repo
 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

 # pushing changes to a remote repo with SSH
 foo$ hg push ssh://user@example.com/~/hg/

 # merge changes from a remote machine
 bar$ hg pull http://foo/
 bar$ hg merge   # merge changes into your working directory

 # Set up a CGI server on your webserver
 foo$ cp hgweb.cgi ~/public_html/hg/index.cgi
 foo$ emacs ~/public_html/hg/index.cgi # adjust the defaults

For more info:

 Documentation in doc/
 Mercurial website at http://selenic.com/mercurial