equal
deleted
inserted
replaced
168 | |
168 | |
169 o B draft |
169 o B draft |
170 | |
170 | |
171 o A public |
171 o A public |
172 |
172 |
|
173 Unbundling change in the middle of a stack does not affect later changes |
|
174 $ hg strip --no-backup E |
|
175 $ hg phase --secret --force D |
|
176 $ hg log -G -T '{desc} {phase}\n' |
|
177 o D secret |
|
178 | |
|
179 o C draft |
|
180 | |
|
181 o B draft |
|
182 | |
|
183 o A public |
|
184 |
|
185 $ hg bundle --base A -r B bundle |
|
186 1 changesets found |
|
187 $ hg unbundle -q bundle |
|
188 $ rm bundle |
|
189 $ hg log -G -T '{desc} {phase}\n' |
|
190 o D secret |
|
191 | |
|
192 o C draft |
|
193 | |
|
194 o B draft |
|
195 | |
|
196 o A public |
|
197 |
|
198 |
173 $ cd .. |
199 $ cd .. |
174 |
200 |
175 Set up repo with non-linear history |
201 Set up repo with non-linear history |
176 $ hg init non-linear |
202 $ hg init non-linear |
177 $ cd non-linear |
203 $ cd non-linear |