--- a/tests/test-shelve.t	Wed Oct 09 14:15:34 2013 -0700
+++ b/tests/test-shelve.t	Fri Oct 11 17:19:40 2013 -0700
@@ -328,7 +328,6 @@
   3:2e69b451d1ea
 
   $ hg status -C
-  M a/a
   M b.rename/b
     b/b
   M c.copy
@@ -341,8 +340,6 @@
 
   $ hg shelve -l
 
-  $ hg commit -m whee a/a
-
 #if execbit
 
 ensure that metadata-only changes are shelved
@@ -390,10 +387,9 @@
   merging a/a
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg parents -q
-  5:01ba9745dc5a
+  4:33f7f61e6c5e
   $ hg shelve -l
   $ hg status
-  M a/a
   A foo/foo
   $ cat a/a
   a
@@ -423,12 +419,12 @@
 
   $ hg bookmark test
   $ hg bookmark
-   * test                      5:01ba9745dc5a
+   * test                      4:33f7f61e6c5e
   $ hg shelve
   shelved as test
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg bookmark
-   * test                      5:01ba9745dc5a
+   * test                      4:33f7f61e6c5e
   $ hg unshelve
   unshelving change 'test'
   adding changesets
@@ -437,7 +433,7 @@
   added 1 changesets with 1 changes to 7 files
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg bookmark
-   * test                      5:01ba9745dc5a
+   * test                      4:33f7f61e6c5e
 
 shelve should still work even if mq is disabled
 
@@ -453,3 +449,36 @@
   adding file changes
   added 1 changesets with 1 changes to 7 files
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+shelve should leave dirstate clean (issue 4055)
+
+  $ cd ..
+  $ hg init shelverebase
+  $ cd shelverebase
+  $ printf 'x\ny\n' > x
+  $ echo z > z
+  $ hg commit -Aqm xy
+  $ echo z >> x
+  $ hg commit -Aqm z
+  $ hg up 0
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ printf 'a\nx\ny\nz\n' > x
+  $ hg commit -Aqm xyz
+  $ echo c >> z
+  $ hg shelve
+  shelved as default
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg rebase -d 1 --config extensions.rebase=
+  merging x
+  saved backup bundle to $TESTTMP/shelverebase/.hg/strip-backup/323bfa07f744-backup.hg (glob)
+  $ hg unshelve
+  unshelving change 'default'
+  adding changesets
+  adding manifests
+  adding file changes
+  added 2 changesets with 2 changes to 2 files (+1 heads)
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg status
+  M z
+
+  $ cd ..