author | Jose M. Prieto <jmprieto@gmx.net> |
Tue, 03 Oct 2006 12:33:22 +0200 | |
changeset 3257 | c9cd63a6fce9 |
parent 3071 | 547d1a4aa105 |
permissions | -rwxr-xr-x |
#!/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