tests/test-merge3
author mpm@selenic.com
Sat, 27 Aug 2005 22:04:17 -0700
changeset 1117 30ab5b8ee8ec
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
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

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "0 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "0 0"