Mercurial > hg
changeset 5206:6a1d2dd96b8e
abort when adding a file in merged state
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 21 Aug 2007 02:02:08 +0200 |
parents | ce4e67533723 |
children | 212de429e000 |
files | mercurial/localrepo.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Mon Aug 20 22:02:05 2007 +0200 +++ b/mercurial/localrepo.py Tue Aug 21 02:02:08 2007 +0200 @@ -995,7 +995,7 @@ if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)): self.ui.warn(_("%s not added: only files and symlinks " "supported currently\n") % f) - elif self.dirstate[f] in 'an': + elif self.dirstate[f] in 'amn': self.ui.warn(_("%s already tracked!\n") % f) else: self.dirstate.add(f)