equal
deleted
inserted
replaced
1478 if rev: |
1478 if rev: |
1479 if not forget and not after: |
1479 if not forget and not after: |
1480 # TODO: Remove this restriction and make it also create the copy |
1480 # TODO: Remove this restriction and make it also create the copy |
1481 # targets (and remove the rename source if rename==True). |
1481 # targets (and remove the rename source if rename==True). |
1482 raise error.InputError(_(b'--at-rev requires --after')) |
1482 raise error.InputError(_(b'--at-rev requires --after')) |
1483 ctx = scmutil.revsingle(repo, rev) |
1483 ctx = logcmdutil.revsingle(repo, rev) |
1484 if len(ctx.parents()) > 1: |
1484 if len(ctx.parents()) > 1: |
1485 raise error.InputError( |
1485 raise error.InputError( |
1486 _(b'cannot mark/unmark copy in merge commit') |
1486 _(b'cannot mark/unmark copy in merge commit') |
1487 ) |
1487 ) |
1488 else: |
1488 else: |