Show More
@@ -7665,6 +7665,7 b' def update(ui, repo, node=None, **opts):' | |||
|
7665 | 7665 | |
|
7666 | 7666 | Returns 0 on success, 1 if there are unresolved files. |
|
7667 | 7667 | """ |
|
7668 | cmdutil.check_at_most_one_arg(opts, b'clean', b'check', b'merge') | |
|
7668 | 7669 | rev = opts.get('rev') |
|
7669 | 7670 | date = opts.get('date') |
|
7670 | 7671 | clean = opts.get('clean') |
@@ -7686,14 +7687,6 b' def update(ui, repo, node=None, **opts):' | |||
|
7686 | 7687 | if date and rev is not None: |
|
7687 | 7688 | raise error.Abort(_(b"you can't specify a revision and a date")) |
|
7688 | 7689 | |
|
7689 | if len([x for x in (clean, check, merge) if x]) > 1: | |
|
7690 | raise error.Abort( | |
|
7691 | _( | |
|
7692 | b"can only specify one of -C/--clean, -c/--check, " | |
|
7693 | b"or -m/--merge" | |
|
7694 | ) | |
|
7695 | ) | |
|
7696 | ||
|
7697 | 7690 | updatecheck = None |
|
7698 | 7691 | if check: |
|
7699 | 7692 | updatecheck = b'abort' |
@@ -189,17 +189,17 b' Cases are run as shown in that table, ro' | |||
|
189 | 189 | parent=2 |
|
190 | 190 | |
|
191 | 191 | $ revtest '-cC dirty linear' dirty 1 2 -cC |
|
192 |
abort: can |
|
|
192 | abort: cannot specify both --clean and --check | |
|
193 | 193 | parent=1 |
|
194 | 194 | M foo |
|
195 | 195 | |
|
196 | 196 | $ revtest '-mc dirty linear' dirty 1 2 -mc |
|
197 |
abort: can |
|
|
197 | abort: cannot specify both --check and --merge | |
|
198 | 198 | parent=1 |
|
199 | 199 | M foo |
|
200 | 200 | |
|
201 | 201 | $ revtest '-mC dirty linear' dirty 1 2 -mC |
|
202 |
abort: can |
|
|
202 | abort: cannot specify both --clean and --merge | |
|
203 | 203 | parent=1 |
|
204 | 204 | M foo |
|
205 | 205 |
General Comments 0
You need to be logged in to leave comments.
Login now