Show More
@@ -485,7 +485,7 b' def buildstate(repo, dest, src, base, de' | |||
|
485 | 485 | srcancestors = set(repo.changelog.ancestors(source)) |
|
486 | 486 | baseancestors = set(repo.changelog.ancestors(commonbase.rev())) |
|
487 | 487 | detachset = srcancestors - baseancestors |
|
488 |
detachset. |
|
|
488 | detachset.discard(commonbase.rev()) | |
|
489 | 489 | else: |
|
490 | 490 | if base: |
|
491 | 491 | cwd = repo[base].rev() |
@@ -191,3 +191,44 b' Rebasing C onto E detaching from B and c' | |||
|
191 | 191 | |
|
192 | 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 |
General Comments 0
You need to be logged in to leave comments.
Login now