equal
deleted
inserted
replaced
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 marked working directory as topic: myfeature |
44 $ mkcommit feature1 |
44 $ mkcommit feature1 |
|
45 active topic 'myfeature' grew its first changeset |
45 $ hg stack |
46 $ hg stack |
46 ### topic: myfeature |
47 ### topic: myfeature |
47 ### branch: default |
48 ### branch: default |
48 t1@ add feature1 (current) |
49 t1@ add feature1 (current) |
49 t0^ add ROOT (base) |
50 t0^ add ROOT (base) |
104 Update the common file in a topic |
105 Update the common file in a topic |
105 $ hg topic myotherfeature |
106 $ hg topic myotherfeature |
106 marked working directory as topic: myotherfeature |
107 marked working directory as topic: myotherfeature |
107 $ echo "B" >> file |
108 $ echo "B" >> file |
108 $ hg commit -m "myotherfeature1" |
109 $ hg commit -m "myotherfeature1" |
|
110 active topic 'myotherfeature' grew its first changeset |
109 |
111 |
110 Update the common file in default |
112 Update the common file in default |
111 $ hg update --rev default |
113 $ hg update --rev default |
112 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
114 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
113 $ echo "A2" > file |
115 $ echo "A2" > file |