Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4.out @ 861:cbe5c4d016b7
dirstate.changes() now distinguishes 'hg remove'd or just deleted files.
Interface is not yet changed.
Non-regular files are considered to be removed or deleted.
Removed the unneeded match(fn) call for adding to the unknown list.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 09 Aug 2005 11:32:30 +0100 |
parents | 0902ffece4b4 |
children | 5a034646e472 |
line wrap: on
line source
+ hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg update 0 + hg add c + hg commit -m commit #2 -d 0 0 + hg update -m 1 + hg commit -m commit #3 -d 0 0