merge: simplify 'other deleted' case

merge: simplify backwards revert test, ready to combine with other cases

merge: allow merging going backwards New behavior is generally superior and more correct, except possibly with regards to missing files. hg up . is now effectively a no-op, which is probably the desired behavior for people expecting to move to tip, but may surprise people who were expecting deleted files to reappear. case 1: update to . a-w -> a-w classic: ancestor a missing recreated right? rmed recreated WRONG added forgotten WRONG changed preserved RIGHT conflicted can't happen backward merge: ancestor a (NO EFFECT) missing missing wrong? rm'ed rm'ed RIGHT added preserved RIGHT changed preserved RIGHT conflicted can't happen case 2: update to ancestor of . a-b-w -> b-w \ a classic: ancestor a missing recreated right? rmed recreated wrong? added forgotten wrong? changed preserved RIGHT conflicted preserved wrong? backwards merge: ancestor b missing missing or conflict right? rm'ed missing or conflict right? changed preserved RIGHT conflicted merge RIGHT added preserved right?

merge: reorder remote creation tests

merge: drop recreating case

merge: drop an overwrite test

merge: simplify a delete case

merge: reorder get cases for future simplification

merge: fix prompt keep

merge: remove a flags case

merge: pretend ancestor is local to simplify backwards and overwrite

merge: simplify flag merging code slightly

dirstate: eliminate reference cycle from normalize Bound methods hold a reference to self, so assigning a bound method to an instance unavoidably creates a cycle. Work around this by choosing a normalize method at walk time instead. Eliminate default arg while we're at it.

cleanup: removed unused imports

hgrc.5: wrap lines at 70 chars (whitespace cleanup)

hgignore.5: wrap lines at 70 chars (whitespace cleanup)

hg.1: wrap lines at 70 chars (whitespace cleanup)

hgrc.5: language fixes

hgrc.5: wrap manpage at 80 chars Checked with asciidoc 8.4.5

bookmarks: update docstring

Unbreak run-tests support for out-of-tree extensions

Merge with crew-stable

Some platforms lack the PATH_MAX definition (eg. GNU/Hurd). Thanks to ronny for making it cleaner.

test-fncache: Use find instead of ls -R. Different platforms implement -R differently (and it produces unneccessarily verbose output in this case). find is just as good and more consistent. Unbreaks test on OpenBSD. Edited by pmezard: added 'sort' call

Make test-verify SUSv3 compatible. 'head -c' isn't supported on (at least) OpenBSD and is not part of SUSv3. Instead, use dd. See also: http://www.opengroup.org/onlinepubs/009695399/utilities/head.html

Support branch names in contrib/bash_completion Anywhere a revision is needed a branch name can be used to specify the tip of that branch, so branch names should be tab completed.

Support merge in contrib/bash_completion

context: add a dirty method to detect modified contexts

dirstate: don't complain about 0-length files

commit: move some setup outside the lock