Show More
@@ -1,33 +1,33 | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | echo "[extensions]" >> $HGRCPATH |
|
4 | 4 | echo "hgext.convert=" >> $HGRCPATH |
|
5 | 5 | |
|
6 | 6 | hg init orig |
|
7 | 7 | cd orig |
|
8 | 8 | |
|
9 | 9 | echo foo > foo |
|
10 | 10 | echo bar > bar |
|
11 | 11 | hg ci -qAm 'add foo bar' -d '0 0' |
|
12 | 12 | |
|
13 | 13 | echo >> foo |
|
14 | hg ci -m 'change foo' | |
|
14 | hg ci -m 'change foo' -d '1 0' | |
|
15 | 15 | |
|
16 | 16 | hg up -qC 0 |
|
17 | 17 | hg copy --after --force foo bar |
|
18 | 18 | hg copy foo baz |
|
19 |
hg ci -m 'make bar and baz copies of foo' -d ' |
|
|
19 | hg ci -m 'make bar and baz copies of foo' -d '2 0' | |
|
20 | 20 | |
|
21 | 21 | hg merge |
|
22 |
hg ci -m 'merge local copy' -d ' |
|
|
22 | hg ci -m 'merge local copy' -d '3 0' | |
|
23 | 23 | |
|
24 | 24 | hg up -C 1 |
|
25 | 25 | hg merge 2 |
|
26 |
hg ci -m 'merge remote copy' -d ' |
|
|
26 | hg ci -m 'merge remote copy' -d '4 0' | |
|
27 | 27 | |
|
28 | 28 | cd .. |
|
29 | 29 | hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' |
|
30 | 30 | cd new |
|
31 | 31 | hg out ../orig |
|
32 | 32 | |
|
33 | 33 | true |
General Comments 0
You need to be logged in to leave comments.
Login now