Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-newbranch @ 3620:3109f012c305
Clarify untracked file merge message
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Nov 2006 21:47:55 -0600 |
parents | 8dc14d630b29 |
children | aeafd80c1e78 |
line wrap: on
line source
#!/bin/sh hg init t cd t hg branches echo foo > a hg add a hg ci -m "initial" -d "0 0" hg branch foo hg branch hg ci -m "add branch name" -d "0 0" hg branch bar hg ci -m "change branch name" -d "0 0" hg branch "" hg ci -m "clear branch name" -d "0 0" hg co foo hg branch echo bleah > a hg ci -m "modify a branch" -d "0 0" hg merge hg branch HG_MERGE=true hg ci -m "merge" -d "0 0" hg log hg branches hg branches -q echo % test for invalid branch cache hg rollback hg tip