Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 5636:7e6ddde68a23
rm: complain more about removing added files
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 10 Dec 2007 10:24:21 -0600 |
parents | 2493a478f395 |
children | 47915bf68c44 |
comparison
equal
deleted
inserted
replaced
5635:0c608a8d9c5f | 5636:7e6ddde68a23 |
---|---|
2027 elif abs in added: | 2027 elif abs in added: |
2028 if opts['force']: | 2028 if opts['force']: |
2029 forget.append(abs) | 2029 forget.append(abs) |
2030 continue | 2030 continue |
2031 reason = _('has been marked for add (use -f to force removal)') | 2031 reason = _('has been marked for add (use -f to force removal)') |
2032 exact = 1 # force the message | |
2032 elif abs not in repo.dirstate: | 2033 elif abs not in repo.dirstate: |
2033 reason = _('is not managed') | 2034 reason = _('is not managed') |
2034 elif opts['after'] and not exact and abs not in deleted: | 2035 elif opts['after'] and not exact and abs not in deleted: |
2035 continue | 2036 continue |
2036 elif abs in removed: | 2037 elif abs in removed: |