Mercurial > hg
diff tests/test-flags @ 3321:455109df3669
extend test-flags
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 09 Oct 2006 21:48:44 +0200 |
parents | e506c14382fd |
children | c0b449154a90 |
line wrap: on
line diff
--- a/tests/test-flags Mon Oct 09 21:22:55 2006 +0200 +++ b/tests/test-flags Mon Oct 09 21:48:44 2006 +0200 @@ -10,6 +10,7 @@ hg ci -m "added a b" -d "1000000 0" cd .. +hg clone test1 test3 mkdir test2 cd test2 @@ -29,6 +30,19 @@ hg -v merge -ls -l ../test[12]/a > foo +cd ../test3 +echo 123 >>b +hg ci -m "b updated" -d "1000000 0" + +hg pull ../test2 +hg heads +hg history + +hg -v merge + +ls -l ../test[123]/a > foo cut -b 1-10 < foo +hg debugindex .hg/data/a.i +hg debugindex ../test2/.hg/data/a.i +hg debugindex ../test1/.hg/data/a.i