# HG changeset patch
# User mpm@selenic.com
# Date 1117608031 28800
# Node ID d255d99a7cbdc02efa9abc0b0654a359282cf08c
# Parent  161cef501e8d293067cae5dd962042eb20556fc5
README: integrate some changes from Kevin Smith

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

README: integrate some changes from Kevin Smith

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

iD8DBQFCnVhfywK+sNU5EO8RAtXvAJ4oclpYQm98YArUDbs7ZUfQspQpcACZAXf2
pMG7GKkquua+fS76uxpcCgs=
=yPbJ
-----END PGP SIGNATURE-----


diff -r 161cef501e8d -r d255d99a7cbd README
--- a/README	Tue May 31 22:17:34 2005 -0800
+++ b/README	Tue May 31 22:40:31 2005 -0800
@@ -1,23 +1,26 @@
 Setting up Mercurial:
 
  Note: some distributions fails to include bits of distutils by
- default, you'll need python-dev to install.
+ 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>
 
- Then to install:
+ 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), simply
- run:
+ 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         # 
+
+ You'll also need to set up a tool to handle three-way merges:
+
  $ export HGMERGE=tkmerge                # customize this
 
  And finally:
@@ -81,6 +84,14 @@
  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