mercurial/commands.py
changeset 23351 1cbc00ff2373
parent 23325 4165cfd67519
child 23404 b913c394386f
equal deleted inserted replaced
23350:e63941631a3f 23351:1cbc00ff2373
  6183         c = repo[None]
  6183         c = repo[None]
  6184         if c.dirty(merge=False, branch=False, missing=True):
  6184         if c.dirty(merge=False, branch=False, missing=True):
  6185             raise util.Abort(_("uncommitted changes"))
  6185             raise util.Abort(_("uncommitted changes"))
  6186         if rev is None:
  6186         if rev is None:
  6187             rev = repo[repo[None].branch()].rev()
  6187             rev = repo[repo[None].branch()].rev()
  6188         mergemod.checkunknown(repo, repo[None], repo[rev])
       
  6189 
  6188 
  6190     repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
  6189     repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
  6191 
  6190 
  6192     if clean:
  6191     if clean:
  6193         ret = hg.clean(repo, rev)
  6192         ret = hg.clean(repo, rev)