Mercurial > hg > pyhgsh
comparison mercurial/dirstate.py @ 1488:08c7851969cc
only files in normal state should be marked as deleted
fix a traceback when you removed an added file
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 02 Nov 2005 16:08:48 -0800 |
| parents | 2bc6cd62a29c |
| children | 91c0e8d7ddcf |
comparison
equal
deleted
inserted
replaced
| 1487:2bc6cd62a29c | 1488:08c7851969cc |
|---|---|
| 388 # We need to re-check that it is a valid file | 388 # We need to re-check that it is a valid file |
| 389 if st and self.supported_type(fn, st): | 389 if st and self.supported_type(fn, st): |
| 390 nonexistent = False | 390 nonexistent = False |
| 391 # XXX: what to do with file no longer present in the fs | 391 # XXX: what to do with file no longer present in the fs |
| 392 # who are not removed in the dirstate ? | 392 # who are not removed in the dirstate ? |
| 393 if nonexistent: | 393 if nonexistent and type in "nm": |
| 394 deleted.append(fn) | 394 deleted.append(fn) |
| 395 continue | 395 continue |
| 396 # check the common case first | 396 # check the common case first |
| 397 if type == 'n': | 397 if type == 'n': |
| 398 if not st: | 398 if not st: |