##// END OF EJS Templates
commit: add tests for the 'created new head' message
Gilles Moris -
r11318:7d780c04 default
parent child Browse files
Show More
@@ -114,3 +114,73 b' heads 0 1 2 3 4 5 6 7'
114
114
115 echo '% topological heads'
115 echo '% topological heads'
116 heads -t
116 heads -t
117
118 echo '______________'
119 cd ..
120
121 hg init newheadmsg
122 cd newheadmsg
123
124 echo '% created new head message'
125 echo '% init: no msg'
126 echo 1 > a
127 hg ci -Am "a0: Initial root"
128 echo 2 >> a
129 hg ci -m "a1 (HN)"
130
131 hg branch b
132 echo 1 > b
133 hg ci -Am "b2: Initial root for branch b"
134 echo 2 >> b
135 hg ci -m "b3 (HN)"
136
137 echo '% case NN: msg'
138 hg up -q null
139 hg branch -f b
140 echo 1 > B
141 hg ci -Am "b4 (NN): new topo root for branch b"
142
143 echo '% case HN: no msg'
144 echo 2 >> B
145 hg ci -m "b5 (HN)"
146
147 echo '% case BN: msg'
148 hg branch -f default
149 echo 1 > A
150 hg ci -Am "a6 (BN): new branch root"
151
152 echo '% case CN: msg'
153 hg up -q 4
154 echo 3 >> BB
155 hg ci -Am "b7 (CN): regular new head"
156
157 echo '% case BB: msg'
158 hg up -q 4
159 hg merge -q 3
160 hg branch -f default
161 hg ci -m "a8 (BB): weird new branch root"
162
163 echo '% case CB: msg'
164 hg up -q 4
165 hg merge -q 1
166 hg ci -m "b9 (CB): new head from branch merge"
167
168 echo '% case HB: no msg'
169 hg up -q 7
170 hg merge -q 6
171 hg ci -m "b10 (HB): continuing head from branch merge"
172
173 echo '% case CC: msg'
174 hg up -q 4
175 hg merge -q 2
176 hg ci -m "b11 (CC): new head from merge"
177
178 echo '% case CH: no msg'
179 hg up -q 2
180 hg merge -q 10
181 hg ci -m "b12 (CH): continuing head from merge"
182
183 echo '% case HH: no msg'
184 hg merge -q 3
185 hg ci -m "b12 (HH): merging two heads"
186
@@ -179,3 +179,31 b' 0: Adding root node ()'
179 7: Adding c branch (c)
179 7: Adding c branch (c)
180 3: Adding b branch head 1 (b)
180 3: Adding b branch head 1 (b)
181 1: Adding a branch (a)
181 1: Adding a branch (a)
182 ______________
183 % created new head message
184 % init: no msg
185 adding a
186 marked working directory as branch b
187 adding b
188 % case NN: msg
189 marked working directory as branch b
190 adding B
191 created new head
192 % case HN: no msg
193 % case BN: msg
194 marked working directory as branch default
195 adding A
196 created new head
197 % case CN: msg
198 adding BB
199 created new head
200 % case BB: msg
201 marked working directory as branch default
202 created new head
203 % case CB: msg
204 created new head
205 % case HB: no msg
206 % case CC: msg
207 created new head
208 % case CH: no msg
209 % case HH: no msg
General Comments 0
You need to be logged in to leave comments. Login now