tests/test-merge1.out
author mpm@selenic.com
Sat, 27 Aug 2005 22:04:17 -0700
changeset 1117 30ab5b8ee8ec
parent 925 5a034646e472
child 1236 67a28636ea64
permissions -rw-r--r--
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

merging for b
merging b
This is file b1
merging for b
merging b
merging for b
merging b