tests/test-convert-splicemap.out
author Patrick Mezard <pmezard@gmail.com>
Mon, 20 Sep 2010 22:29:13 +0200
changeset 12345 e0ee3e822a9a
parent 9611 a3d73b3e1f8a
permissions -rw-r--r--
Merge with stable

adding a
adding b
adding c
adding a
adding d
adding e
% test invalid splicemap
abort: syntax error in splicemap(1): key/value pair expected
% splice repo2 on repo1
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
scanning source...
sorting...
converting...
2 addaandd
spliced in ['6d4c2037ddc2cb2627ac3a244ecce35283268f8e'] as parents of 527cdedf31fbd5ea708aa14eeecf53d4676f38db
1 changed
spliced in ['e55c719b85b60e5102fac26110ba626e7cb6b7dc', '527cdedf31fbd5ea708aa14eeecf53d4676f38db'] as parents of e4ea00df91897da3079a10fab658c1eddba6617b
0 adde
o  5 "adde" files: e
|
o    4 "changed" files: d
|\
| o  3 "addaandd" files: a d
| |
@ |  2 "addc" files: c
|/
o  1 "addb" files: a b
|
o  0 "adda" files: a