tests/test-topic-shelve.t
branchmercurial-4.0
changeset 3003 ddf28837f5af
parent 2997 a61634f52742
child 3060 f43a310c4338
equal deleted inserted replaced
2810:604ddf1e1a8e 3003:ddf28837f5af
    11   > EOF
    11   > EOF
    12 
    12 
    13   $ touch a
    13   $ touch a
    14   $ echo "Hello" >> a
    14   $ echo "Hello" >> a
    15   $ hg topic "testing-shelve"
    15   $ hg topic "testing-shelve"
       
    16   marked working directory as topic: testing-shelve
    16   $ hg topic
    17   $ hg topic
    17    * testing-shelve
    18    * testing-shelve
    18   $ hg ci -m "First commit" -A
    19   $ hg ci -m "First commit" -A
    19   adding a
    20   adding a
       
    21   active topic 'testing-shelve' grew its first changeset
    20   $ hg topic
    22   $ hg topic
    21    * testing-shelve
    23    * testing-shelve
    22   $ echo " World" >> a
    24   $ echo " World" >> a
    23   $ hg stack
    25   $ hg stack
    24   ### topic: testing-shelve
    26   ### topic: testing-shelve
    25   ### branch: default
    27   ### target: default (branch)
    26   t1@ First commit (current)
    28   t1@ First commit (current)
    27 
    29 
    28 shelve test
    30 shelve test
    29 -----------
    31 -----------
    30 
    32 
    33   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    35   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    34   $ hg topic
    36   $ hg topic
    35    * testing-shelve
    37    * testing-shelve
    36   $ hg stack
    38   $ hg stack
    37   ### topic: testing-shelve
    39   ### topic: testing-shelve
    38   ### branch: default
    40   ### target: default (branch)
    39   t1@ First commit (current)
    41   t1@ First commit (current)
    40 
    42 
    41 unshelve test
    43 unshelve test
    42 -------------
    44 -------------
    43   $ hg unshelve
    45   $ hg unshelve
    44   unshelving change 'default'
    46   unshelving change 'default'
    45   $ hg topic
    47   $ hg topic
    46    * testing-shelve
    48    * testing-shelve
    47   $ hg stack
    49   $ hg stack
    48   ### topic: testing-shelve
    50   ### topic: testing-shelve
    49   ### branch: default
    51   ### target: default (branch)
    50   t1@ First commit (current)
    52   t1@ First commit (current)