equal
deleted
inserted
replaced
45 done |
45 done |
46 |
46 |
47 HGMERGE=true hg merge 3 |
47 HGMERGE=true hg merge 3 |
48 hg ci -m c-d -d "1000000 0" |
48 hg ci -m c-d -d "1000000 0" |
49 |
49 |
50 hg push ../c |
50 hg push ../c; echo $? |
51 hg push -r 2 ../c |
51 hg push -r 2 ../c; echo $? |
52 hg push -r 3 -r 4 ../c |
52 hg push -r 3 ../c; echo $? |
53 hg push -f -r 3 -r 4 ../c |
53 hg push -r 3 -r 4 ../c; echo $? |
54 hg push -r 5 ../c |
54 hg push -f -r 3 -r 4 ../c; echo $? |
|
55 hg push -r 5 ../c; echo $? |
55 |
56 |
56 exit 0 |
57 exit 0 |