Mercurial > hg
comparison tests/test-push-warn @ 10909:29a83fb8c067 stable
prepush: add more test cases
author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
---|---|
date | Wed, 14 Apr 2010 19:35:54 +0200 |
parents | 816bac2f9452 |
children | a101a743c570 |
comparison
equal
deleted
inserted
replaced
10908:816bac2f9452 | 10909:29a83fb8c067 |
---|---|
262 echo %% outgoing | 262 echo %% outgoing |
263 hg out inner --template "{rev}: {branches} {desc}\n" | 263 hg out inner --template "{rev}: {branches} {desc}\n" |
264 hg push inner | 264 hg push inner |
265 cd .. | 265 cd .. |
266 | 266 |
267 echo % check prepush with new branch head and new child of former branch head | |
268 echo % but child is on different branch | |
269 hg init p | |
270 cd p | |
271 hg branch A | |
272 echo a0 >a | |
273 hg ci -Ama0 | |
274 echo a1 >a | |
275 hg ci -ma1 | |
276 hg up null | |
277 hg branch B | |
278 echo b0 >b | |
279 hg ci -Amb0 | |
280 echo b1 >b | |
281 hg ci -mb1 | |
282 | |
283 hg clone . inner | |
284 | |
285 hg up A | |
286 hg branch -f B | |
287 echo a3 >a | |
288 hg ci -ma3 | |
289 hg up 3 | |
290 hg branch -f A | |
291 echo b3 >b | |
292 hg ci -mb3 | |
293 | |
294 echo %% glog of local | |
295 hg glog --template "{rev}: {branches} {desc}\n" | |
296 echo %% glog of remote | |
297 hg glog -R inner --template "{rev}: {branches} {desc}\n" | |
298 echo %% outgoing | |
299 hg out inner --template "{rev}: {branches} {desc}\n" | |
300 hg push inner | |
301 cd .. | |
302 | |
267 exit 0 | 303 exit 0 |