Show More
@@ -346,6 +346,9 b' def rebase(ui, repo, **opts):' | |||||
346 | commitmsg = ui.edit(commitmsg, repo.ui.username()) |
|
346 | commitmsg = ui.edit(commitmsg, repo.ui.username()) | |
347 | newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg, |
|
347 | newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg, | |
348 | extrafn=extrafn, editor=editor) |
|
348 | extrafn=extrafn, editor=editor) | |
|
349 | for oldrev in state.iterkeys(): | |||
|
350 | if state[oldrev] > nullmerge: | |||
|
351 | state[oldrev] = newrev | |||
349 |
|
352 | |||
350 | if 'qtip' in repo.tags(): |
|
353 | if 'qtip' in repo.tags(): | |
351 | updatemq(repo, state, skipped, **opts) |
|
354 | updatemq(repo, state, skipped, **opts) |
@@ -57,11 +57,11 b' Rebasing B onto H and collapsing changes' | |||||
57 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
|
57 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | |
58 |
|
58 | |||
59 | $ hg tglogp |
|
59 | $ hg tglogp | |
60 |
|
|
60 | @ 5:secret 'Collapsed revision | |
61 | | * B |
|
61 | | * B | |
62 | | * C |
|
62 | | * C | |
63 | | * D' |
|
63 | | * D' | |
64 |
|
|
64 | o 4:draft 'H' | |
65 | | |
|
65 | | | |
66 | | o 3:draft 'G' |
|
66 | | o 3:draft 'G' | |
67 | |/| |
|
67 | |/| | |
@@ -737,12 +737,13 b' Test collapsing changes that add then re' | |||||
737 | $ touch b |
|
737 | $ touch b | |
738 | $ hg commit -Am b |
|
738 | $ hg commit -Am b | |
739 | adding b |
|
739 | adding b | |
|
740 | $ hg book foo | |||
740 | $ hg rebase -d 0 -r "1::2" --collapse -m collapsed |
|
741 | $ hg rebase -d 0 -r "1::2" --collapse -m collapsed | |
741 | saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/*-backup.hg (glob) |
|
742 | saved backup bundle to $TESTTMP/collapseaddremove/.hg/strip-backup/*-backup.hg (glob) | |
742 | $ hg tglog |
|
743 | $ hg log -G --template "{rev}: '{desc}' {bookmarks}" | |
743 |
|
|
744 | @ 1: 'collapsed' foo | |
744 | | |
|
745 | | | |
745 |
|
|
746 | o 0: 'base' | |
746 |
|
747 | |||
747 | $ hg manifest --rev tip |
|
748 | $ hg manifest --rev tip | |
748 | b |
|
749 | b |
@@ -329,11 +329,11 b' Verify that target is not selected as ex' | |||||
329 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) |
|
329 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) | |
330 |
|
330 | |||
331 | $ hg tglog |
|
331 | $ hg tglog | |
332 |
|
|
332 | @ 8: 'Collapsed revision | |
333 | | * I |
|
333 | | * I | |
334 | | * Merge |
|
334 | | * Merge | |
335 | | * J' |
|
335 | | * J' | |
336 |
|
|
336 | o 7: 'H' | |
337 | | |
|
337 | | | |
338 | | o 6: 'G' |
|
338 | | o 6: 'G' | |
339 | |/| |
|
339 | |/| |
General Comments 0
You need to be logged in to leave comments.
Login now