title: hg shelve created a commit, I don't understand
body: <p>I'm a bit confused by <code>hg shelve</code> because the documentation is rather sparse. Somehow I got a commit in my log of the form:</p>
  
  <pre><code>changeset:   29:ad47ed1ca915
  parent:      27:afca280f2884
  user:        shelve@localhost
  date:        Wed Jun 08 15:30:36 2016 -0600
  summary:     changes to: ...
  </code></pre>
  
  <p>I'm confused as to where this came from. It was my understanding that shelve was just stuffing things on the local machine and that they wouldn't get in the history. Am I misunderstanding that?</p>
  
  <p>Here's my hg command history:</p>
  
  <pre><code>   hg status
     hg shelve list
     hg shelve --list
     hg unshelve
     hg unshelve
     hg resolve
     hg resolve -all
     hg resolve --all
     hg resolve --all
     hg clone a/ b
     # By this point we have the commit (since 28 is after 27)
     hg update -r 28
  </code></pre>
  
  <p>EDIT:</p>
  
  <p>Ok, so the problem seems to be a partial unshelve. However, because I pull the changesets else where now I'm stuck with the changesets and am not sure what to do :(</p>
  
  <p>EDIT2: Here's an example of how to cause this problem:</p>
  
  <pre><code>~ $ cd tmp
  ~/tmp $ mkdir shelve shelve/a
  ~/tmp $ cd shelve/a
  ~/tmp/shelve/a $ hg init
  ~/tmp/shelve/a $ echo a &gt; a
  ~/tmp/shelve/a $ hg add a
  ~/tmp/shelve/a $ hg commit -m "a as a"
  ~/tmp/shelve/a $ cd ..
  ~/tmp/shelve $ hg clone a b
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  ~/tmp/shelve $ cd b
  ~/tmp/shelve/b $ echo aa &gt; a
  ~/tmp/shelve/b $ hg commit -m "a as aa"
  ~/tmp/shelve/b $ cd ../a
  ~/tmp/shelve/a $ echo aaa &gt; a
  ~/tmp/shelve/a $ hg shelve 
  shelved as default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  ~/tmp/shelve/a $ hg pull -u ../b
  pulling from ../b
  searching for changes
  adding changesets
  adding manifests 
  adding file changes 
  added 1 changesets with 1 changes to 1 files
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  ~/tmp/shelve/a $ hg unshelve
  unshelving change 'default'
  rebasing shelved changes 
  rebasing 2:6696488053d1 "changes to: a as a" (tip)
  merging a 
  3 files to edit
  was merge successful (yn)? n
  merging a failed!
  unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
  ~/tmp/shelve/a $ hg heads
  changeset:   2:6696488053d1
  tag:         tip
  parent:      0:845abf4a2513
  user:        shelve@localhost
  date:        Thu Jun 16 19:44:05 2016 -0600
  summary:     changes to: a as a
  
  changeset:   1:e1f75f582f85
  user:        Alex Orange &lt;crazycasta@gmail.com&gt;
  date:        Thu Jun 16 19:44:05 2016 -0600
  summary:     a as aa
  </code></pre>