equal
deleted
inserted
replaced
1616 |
1616 |
1617 if revs and change: |
1617 if revs and change: |
1618 msg = _('cannot specify --rev and --change at the same time') |
1618 msg = _('cannot specify --rev and --change at the same time') |
1619 raise util.Abort(msg) |
1619 raise util.Abort(msg) |
1620 elif change: |
1620 elif change: |
1621 node2 = repo.lookup(change) |
1621 node2 = cmdutil.revsingle(repo, change, None).node() |
1622 node1 = repo[node2].parents()[0].node() |
1622 node1 = repo[node2].parents()[0].node() |
1623 else: |
1623 else: |
1624 node1, node2 = cmdutil.revpair(repo, revs) |
1624 node1, node2 = cmdutil.revpair(repo, revs) |
1625 |
1625 |
1626 if reverse: |
1626 if reverse: |