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 |
|
45 active topic 'myfeature' grew its first changeset |
44 $ hg stack |
46 $ hg stack |
45 ### topic: myfeature |
47 ### topic: myfeature |
46 ### branch: default |
48 ### target: default (branch) |
47 t1@ add feature1 (current) |
49 t1@ add feature1 (current) |
48 t0^ add ROOT (base) |
50 t0^ add ROOT (base) |
49 $ logtopic |
51 $ logtopic |
50 @ 1:39e7a938055e87615edf675c24a10997ff05bb06 |
52 @ 1:39e7a938055e87615edf675c24a10997ff05bb06 |
51 | topics: myfeature |
53 | topics: myfeature |
71 $ hg rebase |
73 $ hg rebase |
72 rebasing 1:39e7a938055e "add feature1" |
74 rebasing 1:39e7a938055e "add feature1" |
73 switching to topic myfeature |
75 switching to topic myfeature |
74 $ hg stack |
76 $ hg stack |
75 ### topic: myfeature |
77 ### topic: myfeature |
76 ### branch: default |
78 ### target: default (branch) |
77 t1@ add feature1 (current) |
79 t1@ add feature1 (current) |
78 t0^ add default (base) |
80 t0^ add default (base) |
79 $ logtopic |
81 $ logtopic |
80 @ 3:fc6593661cf3256ba165cbccd6019ead17cc3726 |
82 @ 3:fc6593661cf3256ba165cbccd6019ead17cc3726 |
81 | topics: myfeature |
83 | topics: myfeature |
85 topics: |
87 topics: |
86 $ hg up 3 |
88 $ hg up 3 |
87 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
89 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88 $ hg stack |
90 $ hg stack |
89 ### topic: myfeature |
91 ### topic: myfeature |
90 ### branch: default |
92 ### target: default (branch) |
91 t1@ add feature1 (current) |
93 t1@ add feature1 (current) |
92 t0^ add default (base) |
94 t0^ add default (base) |
93 |
95 |
94 Check that rebase keep the topic in case of merge conflict |
96 Check that rebase keep the topic in case of merge conflict |
95 ---------------------------------------------------------- |
97 ---------------------------------------------------------- |
100 $ hg commit -A -m "default2" file |
102 $ hg commit -A -m "default2" file |
101 created new head |
103 created new head |
102 |
104 |
103 Update the common file in a topic |
105 Update the common file in a topic |
104 $ hg topic myotherfeature |
106 $ hg topic myotherfeature |
|
107 marked working directory as topic: myotherfeature |
105 $ echo "B" >> file |
108 $ echo "B" >> file |
106 $ hg commit -m "myotherfeature1" |
109 $ hg commit -m "myotherfeature1" |
|
110 active topic 'myotherfeature' grew its first changeset |
107 |
111 |
108 Update the common file in default |
112 Update the common file in default |
109 $ hg update --rev default |
113 $ hg update --rev default |
110 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 |
111 $ echo "A2" > file |
115 $ echo "A2" > file |
147 | topics: |
151 | topics: |
148 o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 |
152 o 0:3e7df3b3b17c6deb4a1c70e790782fdf17af96a7 |
149 topics: |
153 topics: |
150 $ hg stack |
154 $ hg stack |
151 ### topic: myotherfeature |
155 ### topic: myotherfeature |
152 ### branch: default |
156 ### target: default (branch) |
153 t1@ myotherfeature1 (current) |
157 t1@ myotherfeature1 (current) |
154 t0^ default3 (base) |
158 t0^ default3 (base) |
155 $ hg update --rev 7 |
159 $ hg update --rev 7 |
156 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
160 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
157 $ hg stack |
161 $ hg stack |
158 ### topic: myotherfeature |
162 ### topic: myotherfeature |
159 ### branch: default |
163 ### target: default (branch) |
160 t1@ myotherfeature1 (current) |
164 t1@ myotherfeature1 (current) |
161 t0^ default3 (base) |
165 t0^ default3 (base) |