Mercurial > hg
comparison tests/test-convert-splicemap.out @ 8047:04c62275cbc7
convert: better mapfile parsing errors (issue1581/1)
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 11 Apr 2009 21:15:27 +0200 |
parents | |
children | a3d73b3e1f8a |
comparison
equal
deleted
inserted
replaced
8046:f3ef8a352d83 | 8047:04c62275cbc7 |
---|---|
1 adding a | |
2 adding b | |
3 adding c | |
4 adding a | |
5 adding d | |
6 adding e | |
7 % test invalid splicemap | |
8 abort: syntax error in splicemap(1): key/value pair expected | |
9 % splice repo2 on repo1 | |
10 updating working directory | |
11 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 scanning source... | |
13 sorting... | |
14 converting... | |
15 2 addaandd | |
16 spliced in ['6d4c2037ddc2cb2627ac3a244ecce35283268f8e'] as parents of 527cdedf31fbd5ea708aa14eeecf53d4676f38db | |
17 1 changed | |
18 spliced in ['e55c719b85b60e5102fac26110ba626e7cb6b7dc', '527cdedf31fbd5ea708aa14eeecf53d4676f38db'] as parents of e4ea00df91897da3079a10fab658c1eddba6617b | |
19 0 adde | |
20 o 5 "adde" files: e | |
21 | | |
22 o 4 "changed" files: d | |
23 |\ | |
24 | o 3 "addaandd" files: a d | |
25 | | | |
26 @ | 2 "addc" files: c | |
27 |/ | |
28 o 1 "addb" files: a b | |
29 | | |
30 o 0 "adda" files: a | |
31 |