equal
deleted
inserted
replaced
41 |
41 |
42 $ cat > splicemap <<EOF |
42 $ cat > splicemap <<EOF |
43 > $CHILDID2 |
43 > $CHILDID2 |
44 > EOF |
44 > EOF |
45 $ hg convert --splicemap splicemap repo2 repo1 |
45 $ hg convert --splicemap splicemap repo2 repo1 |
46 abort: syntax error in splicemap(1): key/value pair expected |
46 abort: syntax error in splicemap(1): child parent1[,parent2] expected |
47 [255] |
47 [255] |
48 |
48 |
49 splice repo2 on repo1 |
49 splice repo2 on repo1 |
50 |
50 |
51 $ cat > splicemap <<EOF |
51 $ cat > splicemap <<EOF |