equal
deleted
inserted
replaced
9 echo foo > foo |
9 echo foo > foo |
10 echo bar > bar |
10 echo bar > bar |
11 hg ci -qAm 'add foo bar' -d '0 0' |
11 hg ci -qAm 'add foo bar' -d '0 0' |
12 |
12 |
13 echo >> foo |
13 echo >> foo |
14 hg ci -m 'change foo' |
14 hg ci -m 'change foo' -d '1 0' |
15 |
15 |
16 hg up -qC 0 |
16 hg up -qC 0 |
17 hg copy --after --force foo bar |
17 hg copy --after --force foo bar |
18 hg copy foo baz |
18 hg copy foo baz |
19 hg ci -m 'make bar and baz copies of foo' -d '1 0' |
19 hg ci -m 'make bar and baz copies of foo' -d '2 0' |
20 |
20 |
21 hg merge |
21 hg merge |
22 hg ci -m 'merge local copy' -d '2 0' |
22 hg ci -m 'merge local copy' -d '3 0' |
23 |
23 |
24 hg up -C 1 |
24 hg up -C 1 |
25 hg merge 2 |
25 hg merge 2 |
26 hg ci -m 'merge remote copy' -d '3 0' |
26 hg ci -m 'merge remote copy' -d '4 0' |
27 |
27 |
28 cd .. |
28 cd .. |
29 hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' |
29 hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' |
30 cd new |
30 cd new |
31 hg out ../orig |
31 hg out ../orig |