Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-merge1 @ 5459:b0e5f44fdeb3
mpatch: Define Py_ssize_t for old pythons and use it instead of ssize_t.
See also PEP 353.
NOTE: Microsoft compilers (8 or earlier) does not have ssize_t.
author | Shun-ichi GOTO <shunichi.goto@gmail.com> |
---|---|
date | Fri, 12 Oct 2007 11:46:49 +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