Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-merge1 @ 3287:e93c926e069e
Handle odd-sized base85 input and output
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sat, 07 Oct 2006 16:21:33 -0700 |
parents | c93ce7f10f85 |
children | 764688cf51e5 |
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"