Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-merge1 @ 5084:edfe69548e2a
posixfile_nt: '+' should allow read access.
This fixes unexpected I/O error on committing many files
due to cset:8a53b39cd402 (r4902 in crew).
author | Shun-ichi GOTO <shunichi.goto@gmail.com> |
---|---|
date | Wed, 25 Jul 2007 15:58:10 +0900 |
parents | c0b449154a90 |
children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo "[merge]" >> .hg/hgrc echo "followcopies = 1" >> .hg/hgrc echo foo > a echo foo > a2 hg add a a2 hg ci -m "start" -d "0 0" hg mv a b hg mv a2 b2 hg ci -m "rename" -d "0 0" echo "checkout" hg co 0 echo blahblah > a echo blahblah > a2 hg mv a2 c2 hg ci -m "modify" -d "0 0" echo "merge" hg merge -y --debug hg status -AC cat b hg ci -m "merge" -d "0 0" hg debugindex .hg/store/data/b.i hg debugrename b