Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 1621:ee16f06174bd
Restored old behaviour for 'hg co' and 'hg co -C' for removed files.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 12 Jan 2006 21:55:19 +0100 |
parents | 1ba0d7041ac4 |
children | 3024cacfb2c9 5ecf05541e11 |
comparison
equal
deleted
inserted
replaced
1620:6c61646fee5e | 1621:ee16f06174bd |
---|---|
1430 mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False)) | 1430 mfw[f] = util.is_exec(self.wjoin(f), mfw.get(f, False)) |
1431 | 1431 |
1432 if moddirstate: | 1432 if moddirstate: |
1433 wlock = self.wlock() | 1433 wlock = self.wlock() |
1434 | 1434 |
1435 for f in deleted: | 1435 for f in deleted + removed: |
1436 if f in mw: | 1436 if f in mw: |
1437 del mw[f] | 1437 del mw[f] |
1438 | 1438 |
1439 # If we're jumping between revisions (as opposed to merging), | 1439 # If we're jumping between revisions (as opposed to merging), |
1440 # and if neither the working directory nor the target rev has | 1440 # and if neither the working directory nor the target rev has |