Mercurial > hg-stable
diff tests/test-convert-splicemap.t @ 16192:a4413624d014
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 28 Feb 2012 21:17:53 -0600 |
parents | 9479c28a22bf |
children | 123f96c4d454 |
line wrap: on
line diff
--- a/tests/test-convert-splicemap.t Sun Feb 26 17:12:15 2012 +0100 +++ b/tests/test-convert-splicemap.t Tue Feb 28 21:17:53 2012 -0600 @@ -67,10 +67,12 @@ $ cat > splicemap <<EOF > $CHILDID1 $PARENTID1 > $CHILDID2 $PARENTID2,$CHILDID1 + > > EOF $ cat splicemap 527cdedf31fbd5ea708aa14eeecf53d4676f38db 6d4c2037ddc2cb2627ac3a244ecce35283268f8e e4ea00df91897da3079a10fab658c1eddba6617b e55c719b85b60e5102fac26110ba626e7cb6b7dc,527cdedf31fbd5ea708aa14eeecf53d4676f38db + $ hg clone repo1 target1 updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved