Mercurial > hg-stable
view tests/test-addremove @ 3325:50a18815e3f0
Revert changeset c67920d78248.
It breaks 'hg merge && hg up -c REV' when files exist only in one of the
manifests, making hg throw a traceback like:
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Tue, 10 Oct 2006 21:03:24 +0300 |
parents | ff3ea21a981a |
children | f975e986b4bf |
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 0.5 hg commit -mb