# HG changeset patch
# User David Soria Parra <dsp@experimentalworks.net>
# Date 1377793333 25200
# Node ID 8e66ac9c0f0e8d72f633c862dba88dc547ac7e8e
# Parent  6e9bfd51bc6feb310d79665e350e017366cac2f1
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 ]

diff -r 6e9bfd51bc6f -r 8e66ac9c0f0e tests/run-tests.py
--- a/tests/run-tests.py	Thu Sep 19 15:29:28 2013 -0400
+++ b/tests/run-tests.py	Thu Aug 29 09:22:13 2013 -0700
@@ -341,6 +341,7 @@
     hgrc.write('[defaults]\n')
     hgrc.write('backout = -d "0 0"\n')
     hgrc.write('commit = -d "0 0"\n')
+    hgrc.write('shelve = --date "0 0"\n')
     hgrc.write('tag = -d "0 0"\n')
     if options.inotify:
         hgrc.write('[extensions]\n')