Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-copy2 @ 3295:764688cf51e5
merge: remember rename copies and parents properly on commit
record copies in dirstate even if rename was remote
this lets us record it properly at commit
teach checkfilemerge about copies, including merge cases
pull old copy code out of commit
extend rename-merge1 test to show file index
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 08 Oct 2006 19:57:45 -0500 |
parents | 94f38724283f |
children | c0b449154a90 |
line wrap: on
line source
#!/bin/sh hg init echo foo > foo hg add foo hg commit -m1 -d"0 0" echo "# should show copy" hg copy foo bar hg debugstate|grep '^copy' echo "# shouldn't show copy" hg commit -m2 -d"0 0" hg debugstate|grep '^copy' echo "# should match" hg debugindex .hg/data/foo.i hg debugrename bar echo bleah > foo echo quux > bar hg commit -m3 -d"0 0" echo "# should not be renamed" hg debugrename bar hg copy -f foo bar echo "# should show copy" hg debugstate|grep '^copy' hg commit -m3 -d"0 0" echo "# should show no parents for tip" hg debugindex .hg/data/bar.i echo "# should match" hg debugindex .hg/data/foo.i hg debugrename bar echo "# should show no copies" hg debugstate|grep '^copy' exit 0