equal
deleted
inserted
replaced
28 touch x y |
28 touch x y |
29 hg ci -A -m 2 -d "1000000 0" |
29 hg ci -A -m 2 -d "1000000 0" |
30 hg merge 1 |
30 hg merge 1 |
31 hg ci -A -m m1 -d "1000000 0" |
31 hg ci -A -m m1 -d "1000000 0" |
32 #hg log |
32 #hg log |
33 #hg debugindex .hg/00manifest.i |
33 #hg debugindex .hg/store/00manifest.i |
34 hg update -C 1 |
34 hg update -C 1 |
35 hg merge 2 |
35 hg merge 2 |
36 hg ci -A -m m2 -d "1000000 0" |
36 hg ci -A -m m2 -d "1000000 0" |
37 #hg log |
37 #hg log |
38 #hg debugindex .hg/00manifest.i |
38 #hg debugindex .hg/store/00manifest.i |
39 |
39 |
40 cd .. |
40 cd .. |
41 hg clone -r 3 a b |
41 hg clone -r 3 a b |
42 hg clone -r 4 a c |
42 hg clone -r 4 a c |
43 hg -R a outgoing b |
43 hg -R a outgoing b |