Mercurial > hg
diff 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 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-convert-splicemap.out Sat Apr 11 21:15:27 2009 +0200 @@ -0,0 +1,31 @@ +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 working directory +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 +