##// END OF EJS Templates
rebase: handle the case when nothing to rebase (dry-run)...
Sushil khanchi -
r46796:b7ccdb52 default
parent child Browse files
Show More
@@ -1139,13 +1139,16 b' def _dryrunrebase(ui, repo, action, opts'
1139 try:
1139 try:
1140 overrides = {(b'rebase', b'singletransaction'): True}
1140 overrides = {(b'rebase', b'singletransaction'): True}
1141 with ui.configoverride(overrides, b'rebase'):
1141 with ui.configoverride(overrides, b'rebase'):
1142 _origrebase(
1142 res = _origrebase(
1143 ui,
1143 ui,
1144 repo,
1144 repo,
1145 action,
1145 action,
1146 opts,
1146 opts,
1147 rbsrt,
1147 rbsrt,
1148 )
1148 )
1149 if res == _nothingtorebase():
1150 needsabort = False
1151 return res
1149 except error.ConflictResolutionRequired:
1152 except error.ConflictResolutionRequired:
1150 ui.status(_(b'hit a merge conflict\n'))
1153 ui.status(_(b'hit a merge conflict\n'))
1151 return 1
1154 return 1
@@ -342,9 +342,7 b' When nothing to rebase'
342 $ hg reb -r . -d '.^' -n
342 $ hg reb -r . -d '.^' -n
343 starting dry-run rebase; repository will not be changed
343 starting dry-run rebase; repository will not be changed
344 nothing to rebase
344 nothing to rebase
345 dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
345 [1]
346 abort: no rebase in progress
347 [20]
348
346
349 Check dryrun gives correct results when there is no conflict in rebasing
347 Check dryrun gives correct results when there is no conflict in rebasing
350 $ hg rebase -s 2 -d 6 -n
348 $ hg rebase -s 2 -d 6 -n
General Comments 0
You need to be logged in to leave comments. Login now