equal
deleted
inserted
replaced
6182 c = repo[None] |
6182 c = repo[None] |
6183 if c.dirty(merge=False, branch=False, missing=True): |
6183 if c.dirty(merge=False, branch=False, missing=True): |
6184 raise util.Abort(_("uncommitted changes")) |
6184 raise util.Abort(_("uncommitted changes")) |
6185 if rev is None: |
6185 if rev is None: |
6186 rev = repo[repo[None].branch()].rev() |
6186 rev = repo[repo[None].branch()].rev() |
6187 mergemod._checkunknown(repo, repo[None], repo[rev]) |
6187 mergemod.checkunknown(repo, repo[None], repo[rev]) |
6188 |
6188 |
6189 repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
6189 repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
6190 |
6190 |
6191 if clean: |
6191 if clean: |
6192 ret = hg.clean(repo, rev) |
6192 ret = hg.clean(repo, rev) |