Mercurial > hg
view tests/test-simple-update @ 6298:53cbb33e1269
normallookup: during merges, restore the state saved by remove
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
parents | ad3d5b4367cb |
children |
line wrap: on
line source
#!/bin/sh set -e mkdir test cd test echo foo>foo hg init hg addremove hg commit -m "1" hg verify hg clone . ../branch cd ../branch hg co echo bar>>foo hg commit -m "2" cd ../test hg pull ../branch hg verify hg co cat foo hg manifest --debug