Show More
@@ -174,6 +174,7 b' def rebase(ui, repo, **opts):' | |||||
174 | raise util.Abort(_('cannot specify both a ' |
|
174 | raise util.Abort(_('cannot specify both a ' | |
175 | 'revision and a source')) |
|
175 | 'revision and a source')) | |
176 |
|
176 | |||
|
177 | cmdutil.checkunfinished(repo) | |||
177 | cmdutil.bailifchanged(repo) |
|
178 | cmdutil.bailifchanged(repo) | |
178 |
|
179 | |||
179 | if not destf: |
|
180 | if not destf: | |
@@ -798,3 +799,6 b' def uisetup(ui):' | |||||
798 | entry[1].append(('t', 'tool', '', |
|
799 | entry[1].append(('t', 'tool', '', | |
799 | _("specify merge tool for rebase"))) |
|
800 | _("specify merge tool for rebase"))) | |
800 | cmdutil.summaryhooks.add('rebase', summaryhook) |
|
801 | cmdutil.summaryhooks.add('rebase', summaryhook) | |
|
802 | cmdutil.unfinishedstates.append( | |||
|
803 | ['rebasestate', False, _('rebase in progress'), | |||
|
804 | _("use 'hg rebase --continue' or 'hg rebase --abort'")]) |
@@ -66,11 +66,11 b' Rebasing B onto E:' | |||||
66 |
|
66 | |||
67 | Force a commit on C during the interruption: |
|
67 | Force a commit on C during the interruption: | |
68 |
|
68 | |||
69 | $ hg up -q -C 2 |
|
69 | $ hg up -q -C 2 --config 'extensions.rebase=!' | |
70 |
|
70 | |||
71 | $ echo 'Extra' > Extra |
|
71 | $ echo 'Extra' > Extra | |
72 | $ hg add Extra |
|
72 | $ hg add Extra | |
73 | $ hg ci -m 'Extra' |
|
73 | $ hg ci -m 'Extra' --config 'extensions.rebase=!' | |
74 |
|
74 | |||
75 | Force this commit onto secret phase |
|
75 | Force this commit onto secret phase | |
76 |
|
76 | |||
@@ -156,11 +156,11 b' Rebasing B onto E:' | |||||
156 |
|
156 | |||
157 | Force a commit on B' during the interruption: |
|
157 | Force a commit on B' during the interruption: | |
158 |
|
158 | |||
159 | $ hg up -q -C 5 |
|
159 | $ hg up -q -C 5 --config 'extensions.rebase=!' | |
160 |
|
160 | |||
161 | $ echo 'Extra' > Extra |
|
161 | $ echo 'Extra' > Extra | |
162 | $ hg add Extra |
|
162 | $ hg add Extra | |
163 | $ hg ci -m 'Extra' |
|
163 | $ hg ci -m 'Extra' --config 'extensions.rebase=!' | |
164 |
|
164 | |||
165 | $ hg tglog |
|
165 | $ hg tglog | |
166 | @ 6: 'Extra' |
|
166 | @ 6: 'Extra' | |
@@ -227,7 +227,7 b' Rebasing B onto E:' | |||||
227 |
|
227 | |||
228 | Change phase on B and B' |
|
228 | Change phase on B and B' | |
229 |
|
229 | |||
230 | $ hg up -q -C 5 |
|
230 | $ hg up -q -C 5 --config 'extensions.rebase=!' | |
231 | $ hg phase --public 1 |
|
231 | $ hg phase --public 1 | |
232 | $ hg phase --public 5 |
|
232 | $ hg phase --public 5 | |
233 | $ hg phase --secret -f 2 |
|
233 | $ hg phase --secret -f 2 |
General Comments 0
You need to be logged in to leave comments.
Login now