Wed, 02 Oct 2013 01:22:11 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 02 Oct 2013 01:22:11 +0100] rev 1296
Merge with stable
Thu, 29 Aug 2013 09:22:13 -0700 shelve: add a shelve extension to save/restore working changes stable
David Soria Parra <dsp@experimentalworks.net> [Thu, 29 Aug 2013 09:22:13 -0700] rev 1295
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 ]
Tue, 24 Sep 2013 03:12:59 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Tue, 24 Sep 2013 03:12:59 +0100] rev 1294
Merge with stable
Thu, 19 Sep 2013 15:29:28 -0400 run-tests: find mercurial path with syntax valid on both py2 and py3 stable
Augie Fackler <raf@durin42.com> [Thu, 19 Sep 2013 15:29:28 -0400] rev 1293
run-tests: find mercurial path with syntax valid on both py2 and py3 [ original upstream message ]
Thu, 19 Sep 2013 15:29:04 -0400 run-tests: if run by python3, execute setup.py with --c2to3 stable
Augie Fackler <raf@durin42.com> [Thu, 19 Sep 2013 15:29:04 -0400] rev 1292
run-tests: if run by python3, execute setup.py with --c2to3 [ original upstream message ]
Mon, 05 Aug 2013 13:19:38 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 05 Aug 2013 13:19:38 +0100] rev 1291
Merge with stable
Fri, 26 Jul 2013 21:18:40 -0400 run-tests: only check the common criteria once per test stable
Simon Heimberg <simohe@besonet.ch> [Fri, 26 Jul 2013 21:18:40 -0400] rev 1290
run-tests: only check the common criteria once per test [ original upstream message ]
(0) -1000 -300 -100 -30 -10 -7 +7 +10 +30 tip