equal
deleted
inserted
replaced
5487 if date and rev is not None: |
5487 if date and rev is not None: |
5488 raise error.Abort(_("you can't specify a revision and a date")) |
5488 raise error.Abort(_("you can't specify a revision and a date")) |
5489 |
5489 |
5490 if len([x for x in (clean, check, merge) if x]) > 1: |
5490 if len([x for x in (clean, check, merge) if x]) > 1: |
5491 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, " |
5491 raise error.Abort(_("can only specify one of -C/--clean, -c/--check, " |
5492 "or -m/merge")) |
5492 "or -m/--merge")) |
5493 |
5493 |
5494 updatecheck = None |
5494 updatecheck = None |
5495 if check: |
5495 if check: |
5496 updatecheck = 'abort' |
5496 updatecheck = 'abort' |
5497 elif merge: |
5497 elif merge: |