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

536c1797202d57efb77bea098e10968ff01602ce universal_scheme

     2

ba000e29ecf3b8df09e0fd363a78cabbe3c2a78f cvs_scheme

     3

1fe48bf82d056f1ece05baccab888357c10c5ab8 r0.1

     4

2e930f84224222ad6514a3c5dc6e00350e199e92 very_cvs

     5

99dc49c5bcfba9d5b412c5fa6d0bf3ba20d68df1 hgkw_standalone_setup

     6

15e8cd7f5295728b089fc8ba236c0f079572fb1d nohook

     7

0c8b7e5c25a6b9a0d2782eaa3748eb546f5a254f archive

     8

0000000000000000000000000000000000000000 universal_scheme

     9

0000000000000000000000000000000000000000 cvs_scheme

    10

0000000000000000000000000000000000000000 r0.1

    11

0000000000000000000000000000000000000000 very_cvs

    12

0000000000000000000000000000000000000000 hgkw_standalone_setup

    13

0000000000000000000000000000000000000000 nohook

    14

0000000000000000000000000000000000000000 archive