Mercurial > hg
diff tests/test-shelve.t @ 19856:28b1b7b9b4a9
shelve: allow shelving of a change with an mq patch applied
We allow shelving of of changes on top of a MQ repository. MQ will
not allow repository changes on top of applied patches. We introduce
checkapplied in MQ to bypass this check.
author | David Soria Parra <dsp@experimentalworks.net> |
---|---|
date | Thu, 29 Aug 2013 09:22:15 -0700 |
parents | a3b285882724 |
children | 5836edcbdc2e |
line wrap: on
line diff
--- a/tests/test-shelve.t Tue Oct 01 12:20:31 2013 +0200 +++ b/tests/test-shelve.t Thu Aug 29 09:22:15 2013 -0700 @@ -1,7 +1,9 @@ $ echo "[extensions]" >> $HGRCPATH + $ echo "mq=" >> $HGRCPATH $ echo "shelve=" >> $HGRCPATH $ echo "[defaults]" >> $HGRCPATH $ echo "diff = --nodates --git" >> $HGRCPATH + $ echo "qnew = --date '0 0'" >> $HGRCPATH $ hg init repo $ cd repo @@ -33,11 +35,12 @@ nothing changed [1] -create another commit +create an mq patch - shelving should work fine with a patch applied $ echo n > n $ hg add n $ hg commit n -m second + $ hg qnew second.patch shelve a change that we will delete later @@ -79,11 +82,11 @@ ensure that our shelved changes exist $ hg shelve -l - default-01 (*) second (glob) - default (*) second (glob) + default-01 (*) [mq]: second.patch (glob) + default (*) [mq]: second.patch (glob) $ hg shelve -l -p default - default (*) second (glob) + default (*) [mq]: second.patch (glob) diff --git a/a/a b/a/a --- a/a/a @@ -95,6 +98,7 @@ delete our older shelved change $ hg shelve -d default + $ hg qfinish -a -q local edits should prevent a shelved change from applying @@ -203,11 +207,11 @@ ensure that we have a merge with unresolved conflicts $ hg heads -q - 3:6ea6529cfc65 - 2:ceefc37abe1e + 4:cebf2b8de087 + 3:2e69b451d1ea $ hg parents -q - 2:ceefc37abe1e - 3:6ea6529cfc65 + 3:2e69b451d1ea + 4:cebf2b8de087 $ hg status M a/a M b.rename/b @@ -268,9 +272,9 @@ $ hg unshelve -a unshelve of 'default' aborted $ hg heads -q - 2:ceefc37abe1e + 3:2e69b451d1ea $ hg parents - changeset: 2:ceefc37abe1e + changeset: 3:2e69b451d1ea tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 @@ -314,14 +318,14 @@ ensure the repo is as we hope $ hg parents - changeset: 2:ceefc37abe1e + changeset: 3:2e69b451d1ea tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: second $ hg heads -q - 2:ceefc37abe1e + 3:2e69b451d1ea $ hg status -C M a/a @@ -386,7 +390,7 @@ merging a/a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved $ hg parents -q - 4:be7e79683c99 + 5:01ba9745dc5a $ hg shelve -l $ hg status M a/a