annotate tests/test-merge4.out @ 1117:30ab5b8ee8ec
fix some rename/copy bugs
- delete copy information when we update dirstate
hg was keeping the copy state and marking things as copied on
multiple commits
- files that are renamed should have no parents
if you do a rename/copy to an existing file, it should not be marked
as descending from its previous revisions.
- remove spurious print from filelog.renamed
- add some more copy tests
author |
mpm@selenic.com |
date |
Sat, 27 Aug 2005 22:04:17 -0700 |
parents |
5a034646e472 |
children |
b2ae81a7df29 |