A Scalable, User-Friendly Source Control System.
Go to file
mpm@selenic.com b7514f43bc revlog: allow duplicates
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

revlog: allow duplicates

If two branches make the same change to the same parent, the result
will be an identical hash. Git apparently does this all the time. Deal
with it gracefully.

manifest hash: c6217eab4b310e1ae529dd75ab90e717dbe5d55d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCqU61ywK+sNU5EO8RAkFqAJ9KhWUQgjZbzzB/+mTkolH0GkT1awCfa+Mj
ulbI4xCRZcvfQE492mcNwQA=
=N6In
-----END PGP SIGNATURE-----
2005-06-10 00:26:29 -08:00
contrib minor hgk fixes 2005-06-08 13:06:46 -08:00
doc add export, recover, and undo to the man page 2005-05-30 09:53:48 -07:00
mercurial revlog: allow duplicates 2005-06-10 00:26:29 -08:00
templates Removed extra closing brace from date string. 2005-06-02 09:23:44 +01: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 Mark the usual things executable 2005-06-08 10:52:01 -08:00
hgeditor Mark the usual things executable 2005-06-08 10:52:01 -08:00
hgmerge Mark the usual things executable 2005-06-08 10:52:01 -08:00
hgweb.cgi Call python via env in hgweb.cgi 2005-05-31 21:24:14 -08:00
MANIFEST.in hgweb: put map-raw in setup.py and MANIFEST.in 2005-06-01 17:01:09 -08:00
notes.txt Some tweaking of notes.txt 2005-06-05 00:42:44 -08:00
PKG-INFO Add back links from file revisions to changeset revisions 2005-05-03 13:16:10 -08:00
README Update README 2005-06-05 10:42:52 -08:00
rewrite-log Simple script to recompress a log file 2005-05-23 16:06:25 -08:00
setup.py Replace tkmerge with hgmerge 2005-06-03 18:27:55 -08:00

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  # add this to your .bashrc
 $ export PATH=${HOME}/bin:$PATH         # 

 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 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 <rev> # 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 update           # check out the tip revision
 $ hg update <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 update                 # populate the working directory
 $ <make changes>
 $ hg commit
 $ cd ../linux
 $ hg pull ../linux-work     # pull changesets from linux-work
 $ hg update                 # merge the new tip from linux-work into
                             # our working directory

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 the self-hosting hg repo
 foo$ hg init
 foo$ hg pull http://selenic.com/hg/
 foo$ hg update # 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 pull http://foo/
 bar$ hg co        # merge changes into your working directory

 # 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

Symbolic repository names:

 Mercurial uses an optional file called ~/.hgpaths to track repo
 locations symbolically. Simply add a line with the name, a space, and
 a URL:

 foo$ echo "main http://selenic.com/hg/" >> ~/.hgpaths
 foo$ hg merge main
 foo$ hg co