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? [ original upstream message ]

$Id$

keyword extension for Mercurial SCM
===================================

CAVEAT: Please use the keyword extension distributed with
Mercurial > 1.0.2!
For Mercurial 0.9.2 to 1.0.2 install the 0.9.2compat branch.

The default and stable branches are meant for development.

install
-------

Run "python setup.py install".
See also "pyton setup.py --help".
Then add the line:

[extensions]
keyword = /path/to/hgkw/keyword.py

to your hgrc, where /path/to/ is somewhere in your $PYTHONPATH.


first steps and online help
---------------------------

$ hg help keyword 
$ hg kwdemo


testing
-------

$ cd tests
$ python run-tests.py --with-hg=/path/to/hg test-keyword