Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 9187:7bb1dbfd3082
update: allow -c to jump branches if clean
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 22 Jul 2009 17:59:11 -0500 |
parents | 98d90ad54749 |
children | 4c287332e03b |
comparison
equal
deleted
inserted
replaced
9186:f783bb979fb3 | 9187:7bb1dbfd3082 |
---|---|
3043 if date: | 3043 if date: |
3044 if rev: | 3044 if rev: |
3045 raise util.Abort(_("you can't specify a revision and a date")) | 3045 raise util.Abort(_("you can't specify a revision and a date")) |
3046 rev = cmdutil.finddate(ui, repo, date) | 3046 rev = cmdutil.finddate(ui, repo, date) |
3047 | 3047 |
3048 if clean: | 3048 if clean or check: |
3049 return hg.clean(repo, rev) | 3049 return hg.clean(repo, rev) |
3050 else: | 3050 else: |
3051 return hg.update(repo, rev) | 3051 return hg.update(repo, rev) |
3052 | 3052 |
3053 def verify(ui, repo): | 3053 def verify(ui, repo): |