A Scalable, User-Friendly Source Control System.
Go to file
2006-12-12 11:39:05 +01:00
contrib Remove hard-coded version numbers and release notes from packaging 2006-12-10 17:41:07 -06:00
doc fix MANIFEST generation 2006-12-12 11:39:05 +01:00
hgext mq: auto-ignore guards in qinit -c 2006-12-11 16:40:42 -08:00
mercurial Add instructions how to redo/finish failed merge with local working directory. 2006-12-11 18:09:52 +01:00
templates hgweb: report detected character set 2006-12-03 18:47:05 -06:00
tests Add instructions how to redo/finish failed merge with local working directory. 2006-12-11 18:09:52 +01:00
.hgignore Ignore .DS_Store directories 2006-08-21 17:47:02 -07:00
.hgsigs Added signature for changeset 139e81557c46be23be36258ff27566ba0ef3312a 2006-12-10 20:08:16 -06:00
CONTRIBUTORS Add self to contributors 2006-08-18 15:03:16 -07: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 Find the system's MD5 binary. 2006-07-28 13:46:19 -05: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 hgweb.cgi and hgwebdir.cgi fixes/cleanups for user configurable parts: 2006-12-11 14:30:50 +01:00
hgwebdir.cgi hgweb.cgi and hgwebdir.cgi fixes/cleanups for user configurable parts: 2006-12-11 14:30:50 +01:00
Makefile fix MANIFEST generation 2006-12-12 11:39:05 +01:00
README Update README to mention hg debuginstall 2006-12-10 01:04:28 -06:00
setup.py Check for at least having a final release of python 2.3.0 in setup.py 2006-10-31 10:50:16 +01: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 debuginstall                       # run some basic tests
 $ hg                                    # 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 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 project project-work    # create a new branch
 $ cd project-work
 $ <make changes>
 $ hg commit
 $ cd ../project
 $ hg pull ../project-work   # pull changesets from project-work
 $ hg merge                  # merge the new tip from project-work into
                             # our working directory
 $ hg commit                 # commit the result of the merge

Importing patches:

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

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

Exporting a patch:

 (make changes)
 $ hg commit
 $ hg export tip > foo.patch    # export latest change

Network support:

 # pull from the primary Mercurial repo
 foo$ hg clone http://selenic.com/hg/
 foo$ cd hg

 # make your current repo available via http://server:8000/
 foo$ hg serve

 # 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 (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
 foo$ emacs ~/public_html/hg/index.cgi # adjust the defaults

For more info:

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