Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-flags @ 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 | e506c14382fd |
children | 455109df3669 |
line wrap: on
line source
#!/bin/sh -e umask 027 mkdir test1 cd test1 hg init touch a b hg add a b hg ci -m "added a b" -d "1000000 0" cd .. mkdir test2 cd test2 hg init hg pull ../test1 hg co chmod +x a hg ci -m "chmod +x a" -d "1000000 0" cd ../test1 echo 123 >>a hg ci -m "a updated" -d "1000000 0" hg pull ../test2 hg heads hg history hg -v merge ls -l ../test[12]/a > foo cut -b 1-10 < foo