A Scalable, User-Friendly Source Control System.
Go to file
Lee Cantey 5f23e95446 Fixes to testpid() for Windows.
Handle processes that no longer exist and processes that belong to another user.

Enables the lock breaking changes from 0ab4c12ad060 and subsequently "fixes" the left over locks reported in bug 112.
2006-03-30 18:20:08 -08:00
contrib hgk "committer:" bug 2006-03-15 03:19:16 +01:00
doc Implementation of per-user .hgignore. 2006-03-24 20:18:02 +01:00
hgext patchbomb: ignore exception if pager quits. 2006-03-09 16:26:49 -08:00
mercurial Fixes to testpid() for Windows. 2006-03-30 18:20:08 -08:00
templates add missing filename title to gitweb's filelog page 2006-03-28 19:02:00 +02:00
tests Use [ x = y ] instead of [ x == y ] in shell scripts. 2006-03-30 18:43:46 +02:00
.hgignore Ignore generated documentation 2006-03-01 09:09:50 +01:00
comparison.txt Cleanup of tabs and trailing spaces. 2005-09-21 07:56:19 +02:00
CONTRIBUTORS Add Benoit to CONTRIBUTORS 2005-10-25 16:31:38 -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 Run commit message editor in the repo root (like hooks). 2006-02-09 07:01:23 +01:00
hgmerge run merge program in repo root. 2006-03-11 21:33:19 -08:00
hgweb.cgi hgweb: pull cgitb into CGI script example, where it can easily be disabled 2005-06-17 08:50:11 -08:00
hgwebdir.cgi hgwebdir: export collections of repos 2006-02-10 11:25:07 -08:00
Makefile add a target for running only one test 2005-10-24 14:53:36 -07:00
MANIFEST.in Include templates/static/* in MANIFEST.in so that distutils setup will include them. 2006-03-24 08:27:24 +01:00
notes.txt Cleanup of tabs and trailing spaces. 2005-09-21 07:56:19 +02:00
README Cleanup of tabs and trailing spaces. 2005-09-21 07:56:19 +02:00
rewrite-log Simple script to recompress a log file 2005-05-23 16:06:25 -08:00
setup.py Don't forget version at the end of setup.py, write it only if changed. 2006-03-19 21:26:58 +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>

 To install system-wide:

 $ python setup.py install   # change python to python2.3 if 2.2 is default

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

 $ python2.3 setup.py install --home=~
 $ 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:

 $ cd project/
 $ hg init         # creates .hg
 $ hg addremove    # add all unknown files and remove all missing 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 update -m              # 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 addremove
 $ hg commit

 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 update -m        # 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
 Mercurial wiki at http://selenic.com/mercurial/wiki