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 ]

     1

$Id$

     2

     3

keyword extension for Mercurial SCM

     4

===================================

     5

     6

CAVEAT: Please use the keyword extension distributed with

     7

Mercurial > 1.0.2!

     8

For Mercurial 0.9.2 to 1.0.2 install the 0.9.2compat branch.

     9

    10

The default and stable branches are meant for development.

    11

    12

install

    13

-------

    14

    15

Run "python setup.py install".

    16

See also "pyton setup.py --help".

    17

Then add the line:

    18

    19

[extensions]

    20

keyword = /path/to/hgkw/keyword.py

    21

    22

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

    23

    24

    25

first steps and online help

    26

---------------------------

    27

    28

$ hg help keyword 

    29

$ hg kwdemo

    30

    31

    32

testing

    33

-------

    34

    35

$ cd tests

    36

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