Mercurial > hg > mercurial-crew-with-dirclash
view README @ 190:3dd5ce2fddb6
merge: short-circuit search for merge into empty repo
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
merge: short-circuit search for merge into empty repo
We should have 3 cases for merge:
- - we have no changesets
- - we have less than half the changesets
- - we have more than half the changesets
For no changesets, we can immediately tell that we need everything.
This happens when we initially branch from a remote repo, so we simply shortcircuit the search and grab everything from the root
When we're actually tracking a project, we should generally have most
of the changesets, so the current search algorithm should minimize
searching.
It should rarely occur that upstreams gets far ahead of us, in which
case, we suffer a longer search.
manifest hash: eabd55841b03225176ea72b985aad36431a438a9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCmfajywK+sNU5EO8RAuyKAKCf7Nw6XSK5HEzbrZae7Q06e3dk4wCgjbK6
YUTEfkpPP1h3mNHIHRKz+aI=
=eGMq
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sun, 29 May 2005 09:06:43 -0800 |
parents | 089594a5bbde |
children | 161cef501e8d |
line wrap: on
line source
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 http://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 # Give symbolic names to repos foo$ echo "main http://selenic.com/hg/" >> ~/.hgpaths # one pair per line foo$ hg merge main foo$ hg co