equal
deleted
inserted
replaced
29 hg merge 2 |
29 hg merge 2 |
30 hg ci -m 'merge remote copy' -d '4 0' |
30 hg ci -m 'merge remote copy' -d '4 0' |
31 |
31 |
32 chmod +x baz |
32 chmod +x baz |
33 hg ci -m 'mark baz executable' -d '5 0' |
33 hg ci -m 'mark baz executable' -d '5 0' |
|
34 |
|
35 hg branch foo |
|
36 hg ci -m 'branch foo' -d '6 0' |
|
37 hg ci --close-branch -m 'close' -d '7 0' |
34 |
38 |
35 cd .. |
39 cd .. |
36 hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' |
40 hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' |
37 cd new |
41 cd new |
38 hg out ../orig |
42 hg out ../orig |