Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 1447:508a3f559553
revert added and removed files to their normal state before reverting
add a test for revert
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 25 Oct 2005 15:51:28 -0700 |
| parents | f84ed9c6131d |
| children | 6fbb13b7a59f |
comparison
equal
deleted
inserted
replaced
| 1446:4babaa52badf | 1447:508a3f559553 |
|---|---|
| 1821 return None, False | 1821 return None, False |
| 1822 relname, ret = body(name) | 1822 relname, ret = body(name) |
| 1823 if ret: | 1823 if ret: |
| 1824 chosen[relname] = 1 | 1824 chosen[relname] = 1 |
| 1825 return ret | 1825 return ret |
| 1826 | |
| 1827 (c, a, d, u) = repo.changes() | |
| 1828 repo.forget(filter(choose, a)) | |
| 1829 repo.undelete(filter(choose, d)) | |
| 1826 | 1830 |
| 1827 r = repo.update(node, False, True, choose, False) | 1831 r = repo.update(node, False, True, choose, False) |
| 1828 for n in relnames: | 1832 for n in relnames: |
| 1829 if n not in chosen: | 1833 if n not in chosen: |
| 1830 ui.warn(_('error: no matches for %s\n') % n) | 1834 ui.warn(_('error: no matches for %s\n') % n) |