import: wrap a transaction around the whole command Now 'rollback' after 'import' is less surprising: it rolls back all of the imported changesets, not just the last one. As an extra added benefit, you don't need 'rollback -f' after 'import --bypass', which was an undesired side effect of fixing issue2998 (59e8bc22506e).. Note that this is a different take on issue963, which complained that rollback after importing multiple patches returned the working dir parent to the starting point, not to the second-last patch applied. Since we now rollback the entire import, returning the working dir to the starting point is entirely logical. So this change also undoes a732eebf1958, the fix to issue963, and updates its tests accordingly. Bottom line: rollback after import was weird before issue963, understandable since the fix for issue963, and even better now. [ 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

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