shelve: add a shelve extension to save/restore working changes This extension saves shelved changes using a temporary draft commit, and bundles the temporary commit and its draft ancestors, then strips them. This strategy makes it possible to use Mercurial's bundle and merge machinery to resolve conflicts if necessary when unshelving, even when the destination commit or its ancestors have been amended, squashed, or evolved. (Once a change has been unshelved, its associated unbundled commits are either rolled back or stripped.) Storing the shelved change as a bundle also avoids the difficulty that hidden commits would cause, of making it impossible to amend the parent if it is a draft commits (a common scenario). Although this extension shares its name and some functionality with the third party hgshelve extension, it has little else in common. Notably, the hgshelve extension shelves changes as unified diffs, which makes conflict resolution a matter of finding .rej files and conflict markers, and cleaning up the mess by hand. We do not yet allow hunk-level choosing of changes to record. Compared to the hgshelve extension, this is a small regression in usability, but we hope to integrate that at a later point, once the record machinery becomes more reusable and robust. [ 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