Mercurial > hg
view tests/test-addremove @ 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 | f975e986b4bf |
children | 627399330c7d |
line wrap: on
line source
#!/bin/sh hg init rep cd rep mkdir dir touch foo dir/bar hg -v addremove hg -v commit -m "add 1" -d "1000000 0" cd dir/ touch ../foo_2 bar_2 hg -v addremove hg -v commit -m "add 2" -d "1000000 0" cd .. hg init sim cd sim echo a > a echo a >> a echo a >> a echo c > c hg commit -Ama mv a b rm c echo d > d hg addremove -s 50 hg commit -mb