equal
deleted
inserted
replaced
35 $ echo b > a |
35 $ echo b > a |
36 $ echo d > d |
36 $ echo d > d |
37 $ hg ci -Am addaandd |
37 $ hg ci -Am addaandd |
38 adding a |
38 adding a |
39 adding d |
39 adding d |
|
40 $ INVALIDID1=afd12345af |
|
41 $ INVALIDID2=28173x36ddd1e67bf7098d541130558ef5534a86 |
40 $ CHILDID1=`hg id --debug -i` |
42 $ CHILDID1=`hg id --debug -i` |
41 $ echo d >> d |
43 $ echo d >> d |
42 $ hg ci -Am changed |
44 $ hg ci -Am changed |
43 $ CHILDID2=`hg id --debug -i` |
45 $ CHILDID2=`hg id --debug -i` |
44 $ echo e > e |
46 $ echo e > e |
51 o 1:e4ea00df9189 "changed" files: d |
53 o 1:e4ea00df9189 "changed" files: d |
52 | |
54 | |
53 o 0:527cdedf31fb "addaandd" files: a d |
55 o 0:527cdedf31fb "addaandd" files: a d |
54 |
56 |
55 |
57 |
56 test invalid splicemap |
58 test invalid splicemap1 |
57 |
59 |
58 $ cat > splicemap <<EOF |
60 $ cat > splicemap <<EOF |
59 > $CHILDID2 |
61 > $CHILDID2 |
60 > EOF |
62 > EOF |
61 $ hg convert --splicemap splicemap repo2 repo1 |
63 $ hg convert --splicemap splicemap repo2 repo1 |
62 abort: syntax error in splicemap(1): child parent1[,parent2] expected |
64 abort: syntax error in splicemap(1): child parent1[,parent2] expected |
|
65 [255] |
|
66 |
|
67 test invalid splicemap2 |
|
68 |
|
69 $ cat > splicemap <<EOF |
|
70 > $CHILDID2 $PARENTID1, $PARENTID2, $PARENTID2 |
|
71 > EOF |
|
72 $ hg convert --splicemap splicemap repo2 repo1 |
|
73 abort: syntax error in splicemap(1): child parent1[,parent2] expected |
|
74 [255] |
|
75 |
|
76 test invalid splicemap3 |
|
77 |
|
78 $ cat > splicemap <<EOF |
|
79 > $INVALIDID1 $INVALIDID2 |
|
80 > EOF |
|
81 $ hg convert --splicemap splicemap repo2 repo1 |
|
82 abort: splicemap entry afd12345af is not a valid revision identifier |
63 [255] |
83 [255] |
64 |
84 |
65 splice repo2 on repo1 |
85 splice repo2 on repo1 |
66 |
86 |
67 $ cat > splicemap <<EOF |
87 $ cat > splicemap <<EOF |