Show More
@@ -1239,6 +1239,8 b' def uisetup(ui):' | |||||
1239 | cmdutil.unfinishedstates.append( |
|
1239 | cmdutil.unfinishedstates.append( | |
1240 | ['rebasestate', False, False, _('rebase in progress'), |
|
1240 | ['rebasestate', False, False, _('rebase in progress'), | |
1241 | _("use 'hg rebase --continue' or 'hg rebase --abort'")]) |
|
1241 | _("use 'hg rebase --continue' or 'hg rebase --abort'")]) | |
|
1242 | cmdutil.afterresolvedstates.append( | |||
|
1243 | ['rebasestate', _('hg rebase --continue')]) | |||
1242 | # ensure rebased rev are not hidden |
|
1244 | # ensure rebased rev are not hidden | |
1243 | extensions.wrapfunction(repoview, '_getdynamicblockers', _rebasedvisible) |
|
1245 | extensions.wrapfunction(repoview, '_getdynamicblockers', _rebasedvisible) | |
1244 | revsetpredicate.setup() |
|
1246 | revsetpredicate.setup() |
@@ -590,6 +590,7 b' the 1st commit of resuming.' | |||||
590 | $ echo "manually modified before 'hg rebase --continue'" > large1 |
|
590 | $ echo "manually modified before 'hg rebase --continue'" > large1 | |
591 | $ hg resolve -m normal1 |
|
591 | $ hg resolve -m normal1 | |
592 | (no more unresolved files) |
|
592 | (no more unresolved files) | |
|
593 | continue: hg rebase --continue | |||
593 |
|
|
594 | $ hg rebase --continue --config ui.interactive=True <<EOF | |
594 | > c |
|
595 | > c | |
595 | > EOF |
|
596 | > EOF |
@@ -176,6 +176,7 b' rebase --continue with bookmarks present' | |||||
176 | $ echo 'c' > c |
|
176 | $ echo 'c' > c | |
177 | $ hg resolve --mark c |
|
177 | $ hg resolve --mark c | |
178 | (no more unresolved files) |
|
178 | (no more unresolved files) | |
|
179 | continue: hg rebase --continue | |||
179 | $ hg rebase --continue |
|
180 | $ hg rebase --continue | |
180 | rebasing 3:3d5fa227f4b5 "C" (Y Z) |
|
181 | rebasing 3:3d5fa227f4b5 "C" (Y Z) | |
181 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-backup.hg (glob) |
|
182 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-backup.hg (glob) |
@@ -78,6 +78,7 b' Solve the conflict and go on:' | |||||
78 | $ rm A.orig |
|
78 | $ rm A.orig | |
79 | $ hg resolve -m A |
|
79 | $ hg resolve -m A | |
80 | (no more unresolved files) |
|
80 | (no more unresolved files) | |
|
81 | continue: hg rebase --continue | |||
81 | $ hg rebase --continue |
|
82 | $ hg rebase --continue | |
82 | already rebased 1:27547f69f254 "B" as 45396c49d53b |
|
83 | already rebased 1:27547f69f254 "B" as 45396c49d53b | |
83 | rebasing 2:965c486023db "C" |
|
84 | rebasing 2:965c486023db "C" | |
@@ -134,6 +135,7 b' Solve the conflict and go on:' | |||||
134 | $ rm A.orig |
|
135 | $ rm A.orig | |
135 | $ hg resolve -m A |
|
136 | $ hg resolve -m A | |
136 | (no more unresolved files) |
|
137 | (no more unresolved files) | |
|
138 | continue: hg rebase --continue | |||
137 | $ hg rebase --continue |
|
139 | $ hg rebase --continue | |
138 | rebasing 5:01e6ebbd8272 "F" (tip) |
|
140 | rebasing 5:01e6ebbd8272 "F" (tip) | |
139 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-backup.hg (glob) |
|
141 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/01e6ebbd8272-6fd3a015-backup.hg (glob) |
@@ -83,6 +83,7 b' Conclude rebase:' | |||||
83 | $ echo 'resolved merge' >common |
|
83 | $ echo 'resolved merge' >common | |
84 | $ hg resolve -m common |
|
84 | $ hg resolve -m common | |
85 | (no more unresolved files) |
|
85 | (no more unresolved files) | |
|
86 | continue: hg rebase --continue | |||
86 | $ hg rebase --continue |
|
87 | $ hg rebase --continue | |
87 | already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
|
88 | already rebased 3:3163e20567cc "L1" as 3e046f2ecedb | |
88 | rebasing 4:46f0b057b5c0 "L2" |
|
89 | rebasing 4:46f0b057b5c0 "L2" |
@@ -391,6 +391,7 b' Ensure --continue restores a correct sta' | |||||
391 | [1] |
|
391 | [1] | |
392 | $ hg resolve --all -t internal:local |
|
392 | $ hg resolve --all -t internal:local | |
393 | (no more unresolved files) |
|
393 | (no more unresolved files) | |
|
394 | continue: hg rebase --continue | |||
394 | $ hg rebase -c |
|
395 | $ hg rebase -c | |
395 | rebasing 8:6215fafa5447 "H2" (tip) |
|
396 | rebasing 8:6215fafa5447 "H2" (tip) | |
396 | note: rebase of 8:6215fafa5447 created no changes to commit |
|
397 | note: rebase of 8:6215fafa5447 created no changes to commit |
@@ -107,6 +107,7 b' Solve the conflict and go on:' | |||||
107 | $ rm A.orig |
|
107 | $ rm A.orig | |
108 | $ hg resolve -m A |
|
108 | $ hg resolve -m A | |
109 | (no more unresolved files) |
|
109 | (no more unresolved files) | |
|
110 | continue: hg rebase --continue | |||
110 |
|
111 | |||
111 | $ hg rebase --continue |
|
112 | $ hg rebase --continue | |
112 | already rebased 1:27547f69f254 "B" as 45396c49d53b |
|
113 | already rebased 1:27547f69f254 "B" as 45396c49d53b |
@@ -155,6 +155,7 b' already has one local mq patch' | |||||
155 |
|
155 | |||
156 | $ HGMERGE=internal:local hg resolve --all |
|
156 | $ HGMERGE=internal:local hg resolve --all | |
157 | (no more unresolved files) |
|
157 | (no more unresolved files) | |
|
158 | continue: hg rebase --continue | |||
158 |
|
159 | |||
159 |
|
|
160 | $ hg rebase --continue | |
160 | already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44 |
|
161 | already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44 |
@@ -70,6 +70,7 b' Fix the 1st conflict:' | |||||
70 | $ echo mq1r1 > f |
|
70 | $ echo mq1r1 > f | |
71 | $ hg resolve -m f |
|
71 | $ hg resolve -m f | |
72 | (no more unresolved files) |
|
72 | (no more unresolved files) | |
|
73 | continue: hg rebase --continue | |||
73 | $ hg rebase -c |
|
74 | $ hg rebase -c | |
74 | rebasing 2:3504f44bffc0 "P0" (f.patch qbase) |
|
75 | rebasing 2:3504f44bffc0 "P0" (f.patch qbase) | |
75 | rebasing 3:929394423cd3 "P1" (f2.patch qtip tip) |
|
76 | rebasing 3:929394423cd3 "P1" (f2.patch qtip tip) | |
@@ -83,6 +84,7 b' Fix the 2nd conflict:' | |||||
83 | $ echo mq1r1mq2 > f |
|
84 | $ echo mq1r1mq2 > f | |
84 | $ hg resolve -m f |
|
85 | $ hg resolve -m f | |
85 | (no more unresolved files) |
|
86 | (no more unresolved files) | |
|
87 | continue: hg rebase --continue | |||
86 | $ hg rebase -c |
|
88 | $ hg rebase -c | |
87 | already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c |
|
89 | already rebased 2:3504f44bffc0 "P0" (f.patch qbase) as ebe9914c0d1c | |
88 | rebasing 3:929394423cd3 "P1" (f2.patch qtip) |
|
90 | rebasing 3:929394423cd3 "P1" (f2.patch qtip) |
@@ -484,6 +484,7 b' Test --tool parameter:' | |||||
484 |
|
484 | |||
485 | $ hg resolve -m c2 |
|
485 | $ hg resolve -m c2 | |
486 | (no more unresolved files) |
|
486 | (no more unresolved files) | |
|
487 | continue: hg rebase --continue | |||
487 | $ hg rebase -c --tool internal:fail |
|
488 | $ hg rebase -c --tool internal:fail | |
488 | rebasing 2:e4e3f3546619 "c2b" (tip) |
|
489 | rebasing 2:e4e3f3546619 "c2b" (tip) | |
489 | note: rebase of 2:e4e3f3546619 created no changes to commit |
|
490 | note: rebase of 2:e4e3f3546619 created no changes to commit |
General Comments 0
You need to be logged in to leave comments.
Login now