Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-branch @ 4043:31047b6f7ec1
Copied files sources were not shown by status -C under Win32.
repo.dirstate.copied() takes a normalized paths while local paths were passed.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 14 Jan 2007 19:10:35 +0100 |
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