equal
deleted
inserted
replaced
925 if type == 'n': |
925 if type == 'n': |
926 ui.status('node %s\n' % str(data)) |
926 ui.status('node %s\n' % str(data)) |
927 id, ps = data |
927 id, ps = data |
928 p1 = ps[0] |
928 p1 = ps[0] |
929 if p1 != at: |
929 if p1 != at: |
930 update(ui, repo, node=p1, clean=True) |
930 update(ui, repo, node=str(p1), clean=True) |
931 at = p1 |
931 at = p1 |
932 if repo.dirstate.branch() != atbranch: |
932 if repo.dirstate.branch() != atbranch: |
933 branch(ui, repo, atbranch, force=True) |
933 branch(ui, repo, atbranch, force=True) |
934 if len(ps) > 1: |
934 if len(ps) > 1: |
935 p2 = ps[1] |
935 p2 = ps[1] |
3787 if rev and node: |
3787 if rev and node: |
3788 raise util.Abort(_("please specify just one revision")) |
3788 raise util.Abort(_("please specify just one revision")) |
3789 |
3789 |
3790 if not rev: |
3790 if not rev: |
3791 rev = node |
3791 rev = node |
|
3792 |
|
3793 rev = cmdutil.revsingle(repo, rev, rev).rev() |
3792 |
3794 |
3793 if check and clean: |
3795 if check and clean: |
3794 raise util.Abort(_("cannot specify both -c/--check and -C/--clean")) |
3796 raise util.Abort(_("cannot specify both -c/--check and -C/--clean")) |
3795 |
3797 |
3796 if check: |
3798 if check: |