equal
deleted
inserted
replaced
8 touch a b |
8 touch a b |
9 hg add a b |
9 hg add a b |
10 hg ci -m "added a b" -d "1000000 0" |
10 hg ci -m "added a b" -d "1000000 0" |
11 |
11 |
12 cd .. |
12 cd .. |
|
13 hg clone test1 test3 |
13 mkdir test2 |
14 mkdir test2 |
14 cd test2 |
15 cd test2 |
15 |
16 |
16 hg init |
17 hg init |
17 hg pull ../test1 |
18 hg pull ../test1 |
27 hg heads |
28 hg heads |
28 hg history |
29 hg history |
29 |
30 |
30 hg -v merge |
31 hg -v merge |
31 |
32 |
32 ls -l ../test[12]/a > foo |
33 cd ../test3 |
|
34 echo 123 >>b |
|
35 hg ci -m "b updated" -d "1000000 0" |
|
36 |
|
37 hg pull ../test2 |
|
38 hg heads |
|
39 hg history |
|
40 |
|
41 hg -v merge |
|
42 |
|
43 ls -l ../test[123]/a > foo |
33 cut -b 1-10 < foo |
44 cut -b 1-10 < foo |
34 |
45 |
|
46 hg debugindex .hg/data/a.i |
|
47 hg debugindex ../test2/.hg/data/a.i |
|
48 hg debugindex ../test1/.hg/data/a.i |