A Scalable, User-Friendly Source Control System.
Go to file
Steve Borho e0c1367c2e zsh completion improvements.
File completers now correctly deal with filenames that contain spaces.
The completers also use 'hg status .' so they'll work correctly when the
default behaviour changes.
2005-10-31 09:58:05 -08:00
contrib zsh completion improvements. 2005-10-31 09:58:05 -08:00
doc Remove copy/rename --parents option 2005-10-26 16:32:50 -07:00
hgext Re-add hgext/__init__.py 2005-09-29 12:49:01 -07:00
mercurial Fix traceback on bad system hgrc files 2005-10-31 09:57:54 -08:00
templates hgweb: add strip and rstrip filters to handle summary 2005-10-25 14:57:14 -07:00
tests Change test-hook to test multiple hooks 2005-10-29 13:45:01 -07:00
.hgignore Switch to new syntax for .hgignore files. 2005-09-17 00:27:27 -07: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 Whitespace cleanups 2005-06-29 10:42:35 -08:00
hgeditor Don't show the diff in hgeditor if there are no changes in file contents. 2005-08-22 19:56:52 +02:00
hgmerge Fix use of diff(1) triggered by set -e. 2005-10-24 14:55:53 -07: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 Documented passing list or dict instead of config file in hgwebdir.cgi 2005-08-29 07:42:46 +02:00
Makefile add a target for running only one test 2005-10-24 14:53:36 -07:00
MANIFEST.in Add Makefile to the manifest 2005-08-24 00:38:36 -07:00
notes.txt Cleanup of tabs and trailing spaces. 2005-09-21 07:56:19 +02:00
PKG-INFO Update version number in PKG-INFO 2005-09-18 14:05:04 -07: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 py2exe is not able to handle win32com.shell 2005-10-24 14:52:41 -07: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