equal
deleted
inserted
replaced
38 $ cd testrebase |
38 $ cd testrebase |
39 $ mkcommit ROOT |
39 $ mkcommit ROOT |
40 |
40 |
41 Work on myfeature |
41 Work on myfeature |
42 $ hg topic myfeature |
42 $ hg topic myfeature |
|
43 marked working directory as topic: myfeature |
43 $ mkcommit feature1 |
44 $ mkcommit feature1 |
44 $ hg stack |
45 $ hg stack |
45 ### topic: myfeature |
46 ### topic: myfeature |
46 ### branch: default |
47 ### branch: default |
47 t1@ add feature1 (current) |
48 t1@ add feature1 (current) |
100 $ hg commit -A -m "default2" file |
101 $ hg commit -A -m "default2" file |
101 created new head |
102 created new head |
102 |
103 |
103 Update the common file in a topic |
104 Update the common file in a topic |
104 $ hg topic myotherfeature |
105 $ hg topic myotherfeature |
|
106 marked working directory as topic: myotherfeature |
105 $ echo "B" >> file |
107 $ echo "B" >> file |
106 $ hg commit -m "myotherfeature1" |
108 $ hg commit -m "myotherfeature1" |
107 |
109 |
108 Update the common file in default |
110 Update the common file in default |
109 $ hg update --rev default |
111 $ hg update --rev default |