36 for i in 1 2 3 4 5 6 7 8 9 10; do |
36 for i in 1 2 3 4 5 6 7 8 9 10; do |
37 echo $i >> file.txt |
37 echo $i >> file.txt |
38 done |
38 done |
39 hg commit -m "lots of text" # 3 |
39 hg commit -m "lots of text" # 3 |
40 |
40 |
41 sed -i -e 's,^2$,x,' file.txt |
41 sed -e 's,^2$,x,' file.txt > file.txt.tmp |
|
42 mv file.txt.tmp file.txt |
42 hg commit -m "changed 2 to x" # 4 |
43 hg commit -m "changed 2 to x" # 4 |
43 |
44 |
44 hg up -r 3 > /dev/null 2>&1 # updated, merged, removed, unresolved |
45 hg up -r 3 > /dev/null 2>&1 # updated, merged, removed, unresolved |
45 sed -i -e 's,^8$,y,' file.txt |
46 sed -e 's,^8$,y,' file.txt > file.txt.tmp |
|
47 mv file.txt.tmp file.txt |
46 hg commit -m "change 8 to y" > /dev/null 2>&1 # 5 # created new head |
48 hg commit -m "change 8 to y" > /dev/null 2>&1 # 5 # created new head |
47 |
49 |
48 hg up -C -r 4 > /dev/null 2>&1 # updated, merged, removed, unresolved |
50 hg up -C -r 4 > /dev/null 2>&1 # updated, merged, removed, unresolved |
49 hg merge -r 5 > /dev/null 2>&1 # updated, merged, removed, unresolved |
51 hg merge -r 5 > /dev/null 2>&1 # updated, merged, removed, unresolved |
50 hg commit -m "merging 8 to y" # 6 |
52 hg commit -m "merging 8 to y" # 6 |