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 0 > a

     3

  $ echo 0 > b

     4

  $ hg ci -A -m m

     5

  adding a

     6

  adding b

     7

  $ hg rm a

     8

  $ hg cat a

     9

  0

    10

  $ hg cat --decode a # more tests in test-encode

    11

  0

    12

  $ echo 1 > b

    13

  $ hg ci -m m

    14

  $ echo 2 > b

    15

  $ hg cat -r 0 a

    16

  0

    17

  $ hg cat -r 0 b

    18

  0

    19

  $ hg cat -r 1 a

    20

  a: no such file in rev 7040230c159c

    21

  [1]

    22

  $ hg cat -r 1 b

    23

  1

    24

    25

Test fileset

    26

    27

  $ echo 3 > c

    28

  $ hg ci -Am addmore c

    29

  $ hg cat 'set:not(b) or a'

    30

  3

    31

  $ hg cat 'set:c or b'

    32

  1

    33

  3

    34