Mercurial > hg > mercurial-crew-with-dirclash
view README @ 671:efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Node ID 5076cf1fd6a1b8eb410e5e03cb004ca6a52a30f9
# Parent 7369ec5d93f2ffd490a43970edd9adf8d2bbe269
Move hgrc documentation out to its own man page, hgrc(5).
The new man page expands on the existing documentation by describing
the file format and the purpose of each section and field.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sun, 10 Jul 2005 16:14:06 -0800 |
parents | f597539c7abd |
children | 1d5b97537561 4f81068ed8cd |
line wrap: on
line source
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