A Scalable, User-Friendly Source Control System.
Go to file
mpm@selenic.com 759ec3f6bf hg merge: abort if there are outstanding changes in the working directory
We currently don't support merging from the tip into the working
directory, so merge with outstanding local changes is asking for
trouble.
2005-05-26 22:54:48 -08:00
mercurial hgweb: make navigation of changesets a bit nicer 2005-05-26 22:47:43 -08:00
templates hgweb: make navigation of changesets a bit nicer 2005-05-26 22:47:43 -08:00
tests Add some tests to the repo 2005-05-04 22:57:51 -08:00
.hgignore Add an O(m + nlog n) patching extension 2005-05-16 22:08:33 -08:00
comparison.txt Minor updates to comparison 2005-05-23 16:05:05 -08:00
convert-repo Add script for doing conversion of repo from oldstyle to newstyle 2005-05-20 17:28:09 -08:00
hg hg merge: abort if there are outstanding changes in the working directory 2005-05-26 22:54:48 -08:00
hgweb.cgi Add example CGI script 2005-05-25 16:28:23 -08:00
MANIFEST.in Add MANIFEST.in to repo 2005-05-03 18:51:16 -08:00
notes.txt Minor corrections 2005-05-12 01:20:43 -08:00
PKG-INFO Add back links from file revisions to changeset revisions 2005-05-03 13:16:10 -08:00
README Update the README a bit 2005-05-25 16:40:22 -08:00
rewrite-log Simple script to recompress a log file 2005-05-23 16:06:25 -08:00
setup.py Install the templates where they can be found by hgweb.py 2005-05-25 16:21:06 -08:00
tkmerge Add back links from file revisions to changeset revisions 2005-05-03 13:16:10 -08:00

Setting up Mercurial in your home directory:

 Note: Debian fails to include bits of distutils, you'll need
 python-dev to install. Alternately, shove everything somewhere in
 your path.

 $ tar xvzf mercurial-<ver>.tar.gz
 $ cd mercurial-<ver>
 $ python2.3 setup.py install --home ~
 $ export PYTHONPATH=${HOME}/lib/python  # add this to your .bashrc
 $ export HGMERGE=tkmerge                # customize this
 $ 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 linux/
 $ hg init         # creates .hg
 $ hg status       # show changes between repo and working dir
 $ hg diff         # generate a unidiff
 $ hg addremove    # add all unknown files and remove all missing files
 $ hg commit       # commit all changes, edit changelog entry
 $ hg export       # export a changeset as a diff

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

Mercurial commands:

 $ hg history          # show changesets
 $ hg log Makefile     # show commits per file
 $ hg checkout         # check out the tip revision
 $ hg checkout <id>    # check out a specified changeset
                       # IDs can be tags, revision numbers, or unique
                       # subsets of changeset hash numbers
 $ hg add foo          # add a new file for the next commit
 $ hg remove bar       # mark a file as removed
 $ hg verify           # check repo integrity
 $ hg tags             # show current tags
 $ hg annotate [files] # show changeset numbers for each file line

Branching and merging:

 $ cd ..
 $ mkdir linux-work
 $ cd linux-work
 $ hg branch ../linux        # create a new branch
 $ hg checkout               # populate the working directory
 $ <make changes>
 $ hg commit
 $ cd ../linux
 $ hg merge ../linux-work    # pull changesets from linux-work

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 

Network support:

 # pull the self-hosting hg repo
 foo$ hg init
 foo$ hg merge http://selenic.com/hg/
 foo$ hg checkout  # hg co works too

 # export your current repo via HTTP with browsable interface
 foo$ hg serve -n "My repo" -p 80
 
 # merge changes from a remote machine
 bar$ hg merge hg://foo/
 bar$ hg co        # checkout the result

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