Mercurial > hg
view tests/test-branch @ 3564:eda9e7c9300d
New UnexpectedOutput exception to catch server errors in localrepo.stream_in
If the unexpected is a string, the empty string will be mentioned, and long
strings are cut to at most 400 chars.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 27 Oct 2006 18:17:12 +0200 |
parents | 547d1a4aa105 |
children |
line wrap: on
line source
#!/bin/sh # # test for branch handling # # XXX: need more tests hg init echo a > a echo b > b hg ci -A -m 0 -d "1000000 0" echo aa > a echo bb > b hg ci -m 1 -d "1000000 0" hg tag -l foo hg update 0 hg parents -b # test update hg update -b foo hg parents # test merge hg update 0 echo c > c hg ci -A -m 0.0 -d "1000000 0" hg merge -b foo hg parents -b # re-test with more branches hg update -C 0 echo d > d hg ci -A -m 0.0 -d "1000000 0" hg merge -b foo hg parents -b