Mercurial > hg > hg-fastimport

annotate tests/test-fastimport-anonbranch @ 54:9608f415ebe8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-fastimport-anonbranch: use explicit datesort to avoid breaking test
author Greg Ward <greg-hg@gerg.ca>
date Sun, 19 Jul 2009 11:56:59 -0400
parents 7ff36dc9f0b1
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
1 #!/bin/sh
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
2
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
3 # Branching and merging, all on 'master' (aka 'default').
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
4 # The DAG is
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
5 #
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
6 # 0 -- 1 -- 2 -- 4 -- 6
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
7 # \ /
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
8 # 3 -- 5 -----
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
9
20
1fd08644b5ac Factor out fastimport-common
Greg Ward <greg-hg@gerg.ca>
parents: 19
diff changeset
10 . $TESTDIR/fastimport-common
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
11
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
12 cat > anonbranch.dump <<__EOF__
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
13 # rev 0
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
14 commit refs/heads/master
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
15 committer Example <example@example.org> 1200000000 +0000
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
16 data 17
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
17 initial revision
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
18
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
19 M 644 inline foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
20 data 4
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
21 foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
22
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
23 M 644 inline bar
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
24 data 4
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
25 bar
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
26
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
27 # rev 1
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
28 commit refs/heads/master
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
29 mark :1
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
30 committer Example <example@example.org> 1200000060 +0000
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
31 data 20
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
32 modify foo, add bla
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
33
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
34 M 644 inline foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
35 data 4
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
36 oof
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
37
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
38 M 644 inline bla
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
39 data 4
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
40 bla
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
41
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
42 # rev 2 (continue "mainline" of master)
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
43 commit refs/heads/master
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
44 mark :2
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
45 committer Example <example@example.org> 1200000090 +0000
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
46 data 8
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
47 add oog
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
48
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
49 M 644 inline oog
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
50 data 4
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
51 oog
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
52
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
53 # rev 3 (create branch off rev 1)
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
54 commit refs/heads/master
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
55 mark :3
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
56 committer Example <example@example.org> 1200000120 +0000
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
57 data 11
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
58 modify bla
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
59
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
60 from :1
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
61 M 644 inline bla
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
62 data 10
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
63 blah blah
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
64
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
65 # rev 4 (back to "mainline")
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
66 commit refs/heads/master
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
67 mark :4
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
68 committer Example <example@example.org> 1200000180 +0000
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
69 data 11
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
70 remove oog
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
71
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
72 from :2
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
73 D oog
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
74
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
75 # rev 5 (back on branch)
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
76 commit refs/heads/master
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
77 mark :5
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
78 committer Example <example@example.org> 1200000210 +0000
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
79 data 11
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
80 modify foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
81
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
82 from :3
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
83 M 644 inline foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
84 data 8
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
85 foo foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
86
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
87 # rev 6 (merge branch back to mainline: first parent is 4, second parent is 5)
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
88 commit refs/heads/master
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
89 committer Example <example@example.org> 1200000240 +0000
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
90 data 6
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
91 merge
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
92
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
93 from :4
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
94 merge :5
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
95 # foo comes from mainline; bla comes from branch
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
96 M 644 inline foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
97 data 4
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
98 oof
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
99
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
100 M 644 inline bla
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
101 data 10
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
102 blah blah
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
103
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
104 __EOF__
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
105
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
106 set -e
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
107 echo "% import"
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
108 rm -rf anonbranch
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
109 hg init anonbranch
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
110 cd anonbranch
54
9608f415ebe8 test-fastimport-anonbranch: use explicit datesort to avoid breaking test
Greg Ward <greg-hg@gerg.ca>
parents: 47
diff changeset
111 hg fastimport --datesort ../anonbranch.dump | sed "s|$HGTMP|HGTMP|g"
19
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
112
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
113 echo "% log"
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
114 hg glog --template "{rev}:{node|short}\n{desc}\n\n"
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
115
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
116 echo "% manifest at rev 0"
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
117 hg manifest -r0
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
118
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
119 echo "% manifest at rev 6"
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
120 hg manifest -r6
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
121
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
122 echo "% contents of foo at rev 3"
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
123 hg cat -r3 foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
124
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
125 echo "% contents of bla at rev 3"
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
126 hg cat -r3 bla
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
127
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
128 echo "% contents of foo at rev 5"
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
129 hg cat -r5 foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
130
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
131 echo "% contents of foo at rev 6"
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
132 hg cat -r6 foo
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
133
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
134 echo "% contents of bar at rev 6"
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
135 hg cat -r6 bar
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
136
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
137 echo "% contents of bla at rev 6"
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
138 hg cat -r6 bla
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
139
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
140 echo "% diff merge with first parent (rev 4:6)"
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
141 hg diff -r4:6
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
142
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
143 echo "% diff merge with second parent (rev 5:6)"
d246bcee93ec Add test with branching and merging.
Greg Ward <greg-hg@gerg.ca>
parents:
diff changeset
144 hg diff -r5:6