author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
Mon, 26 Mar 2007 23:50:04 -0300 | |
changeset 4291 | 35b2e02367a5 |
parent 3853 | c0b449154a90 |
permissions | -rwxr-xr-x |
#!/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