equal
deleted
inserted
replaced
5848 rev = cmdutil.finddate(ui, repo, date) |
5848 rev = cmdutil.finddate(ui, repo, date) |
5849 |
5849 |
5850 if check: |
5850 if check: |
5851 c = repo[None] |
5851 c = repo[None] |
5852 if c.dirty(merge=False, branch=False, missing=True): |
5852 if c.dirty(merge=False, branch=False, missing=True): |
5853 raise util.Abort(_("uncommitted local changes")) |
5853 raise util.Abort(_("uncommitted changes")) |
5854 if rev is None: |
5854 if rev is None: |
5855 rev = repo[repo[None].branch()].rev() |
5855 rev = repo[repo[None].branch()].rev() |
5856 mergemod._checkunknown(repo, repo[None], repo[rev]) |
5856 mergemod._checkunknown(repo, repo[None], repo[rev]) |
5857 |
5857 |
5858 if clean: |
5858 if clean: |