Mercurial > hg
view tests/test-merge5.out @ 749:7e4843b7efd2
Update tests to use commit -m and default -u
manifest hash: 6e4385453843031a712005a320d6000595b40d05
author | mpm@selenic.com |
---|---|
date | Thu, 21 Jul 2005 15:05:17 -0500 |
parents | d45d1c90032e |
children | 61ed30e82b27 |
line wrap: on
line source
+ mkdir t + cd t + hg init + echo This is file a1 + echo This is file b1 + hg add a b + hg commit -m 'commit #0' -d '0 0' + echo This is file b22 + hg commit '-mcomment #1' -d '0 0' + hg update 0 + rm b + hg commit -A '-mcomment #2' -d '0 0' + yes k + hg update 1 this update spans a branch affecting the following files: b aborting update spanning branches! (use update -m to perform a branch merge) + exit 0