Show More
@@ -7832,9 +7832,9 b' def update(ui, repo, node=None, **opts):' | |||
|
7832 | 7832 | raise error.InputError(_(b"you can't specify a revision and a date")) |
|
7833 | 7833 | |
|
7834 | 7834 | updatecheck = None |
|
7835 | if check: | |
|
7835 | if check or merge is not None and not merge: | |
|
7836 | 7836 | updatecheck = b'abort' |
|
7837 | elif merge: | |
|
7837 | elif merge or check is not None and not check: | |
|
7838 | 7838 | updatecheck = b'none' |
|
7839 | 7839 | |
|
7840 | 7840 | with repo.wlock(): |
@@ -11,6 +11,7 b' Mercurial XXX.' | |||
|
11 | 11 | |
|
12 | 12 | == Bug Fixes == |
|
13 | 13 | |
|
14 | The `--no-check` and `--no-merge` now properly overwrite the behavior from `commands.update.check`. | |
|
14 | 15 | |
|
15 | 16 | == Backwards Compatibility Changes == |
|
16 | 17 |
@@ -226,6 +226,11 b' Cases are run as shown in that table, ro' | |||
|
226 | 226 | parent=2 |
|
227 | 227 | M foo |
|
228 | 228 | |
|
229 | $ revtest '--merge none dirty linear' dirty 1 2 --no-check | |
|
230 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
231 | parent=2 | |
|
232 | M foo | |
|
233 | ||
|
229 | 234 | $ revtest 'none dirty linear' dirty 1 2 --clean |
|
230 | 235 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
231 | 236 | parent=2 |
@@ -247,6 +252,11 b' Cases are run as shown in that table, ro' | |||
|
247 | 252 | parent=1 |
|
248 | 253 | M foo |
|
249 | 254 | |
|
255 | $ revtest 'none dirty linear' dirty 1 2 --no-merge | |
|
256 | abort: uncommitted changes | |
|
257 | parent=1 | |
|
258 | M foo | |
|
259 | ||
|
250 | 260 | $ revtest 'none dirty linear' dirty 1 2 --clean |
|
251 | 261 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
252 | 262 | parent=2 |
General Comments 0
You need to be logged in to leave comments.
Login now