Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-merge1 @ 3236:696c656202a0
context: make filectx remember changectx in changectx.filectx
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 02 Oct 2006 15:02:28 -0500 |
parents | c82ea81d6850 |
children | c93ce7f10f85 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init 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 cat a cat b hg ci -m "merge" -d "0 0"