Mercurial > hg
comparison tests/test-rebase-detach.t @ 13021:6c800e7ef2f6 stable
rebase: support --detach when null is common ancestor
author | Henrik Stuart <hg@hstuart.dk> |
---|---|
date | Sat, 20 Nov 2010 09:51:56 +0100 |
parents | 6cc4b14fb76b |
children | 012c719103ab |
comparison
equal
deleted
inserted
replaced
13020:ea3bada953d3 | 13021:6c800e7ef2f6 |
---|---|
189 D | 189 D |
190 E | 190 E |
191 | 191 |
192 $ cd .. | 192 $ cd .. |
193 | 193 |
194 Rebasing across null as ancestor | |
195 $ hg clone -q -U a a5 | |
196 | |
197 $ cd a5 | |
198 | |
199 $ echo x > x | |
200 | |
201 $ hg add x | |
202 | |
203 $ hg ci -m "extra branch" | |
204 created new head | |
205 | |
206 $ hg tglog | |
207 @ 5: 'extra branch' | |
208 | |
209 o 4: 'E' | |
210 | | |
211 | o 3: 'D' | |
212 | | | |
213 | o 2: 'C' | |
214 | | | |
215 | o 1: 'B' | |
216 |/ | |
217 o 0: 'A' | |
218 | |
219 $ hg rebase --detach -s 1 -d tip | |
220 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) | |
221 | |
222 $ hg tglog | |
223 @ 5: 'D' | |
224 | | |
225 o 4: 'C' | |
226 | | |
227 o 3: 'B' | |
228 | | |
229 o 2: 'extra branch' | |
230 | |
231 o 1: 'E' | |
232 | | |
233 o 0: 'A' | |
234 |