shelve: status messages from unshelve It was hard for the user to know what was going on when unshelving - especially if the user had to resolve conflicts and thus got to see the intermediate states. Seeing that pending changes was gone could scare the user, make him panic, and do stuff that really made him lose data. Merging (both when rebasing and with pending changes) also requires some understanding of where in the process you are and what you are merging. To help the user we now show a couple of status messages (when relevant): temporarily committing pending changes (restore with 'hg unshelve --abort') rebasing shelved changes

     1

  $ hg init

     2

  $ echo a > a

     3

  $ hg ci -Am t

     4

  adding a

     5

     6

  $ hg mv a b

     7

  $ hg ci -Am t1

     8

  $ hg debugrename b

     9

  b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3

    10

    11

  $ hg mv b a

    12

  $ hg ci -Am t2

    13

  $ hg debugrename a

    14

  a renamed from b:37d9b5d994eab34eda9c16b195ace52c7b129980

    15

    16

  $ hg debugrename --rev 1 b

    17

  b renamed from a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3

    18