Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-newbranch @ 3441:ef2e990f9047
imported patch foo
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 17 Oct 2006 22:34:43 -0500 |
parents | 2576b6731524 |
children | 196baf20232b |
line wrap: on
line source
#!/bin/sh hg init t cd t echo foo > a hg add a hg ci -m "initial" -d "0 0" echo foo > .hg/branch hg ci -m "add branch name" -d "0 0" echo bar > .hg/branch hg ci -m "change branch name" -d "0 0" rm .hg/branch hg ci -m "clear branch name" -d "0 0" hg co foo cat .hg/branch echo bleah > a hg ci -m "modify a branch" -d "0 0" hg merge cat .hg/branch HG_MERGE=true hg ci -m "merge" -d "0 0" hg log