Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 692:695dd9a491da
convert-repo: deal with packed git and other fixes
call out to git-cat-file directly to deal with packed files
use git-diff-tree --root to handle import of first commit
quiet some dirstate warnings
fix parent logic in commit
whitespace bits
topological sort fix
manifest hash: 2943af0168dd2f5e85bba6515fd08687e264863f
author | mpm@selenic.com |
---|---|
date | Wed, 13 Jul 2005 01:53:27 -0800 |
parents | d45d1c90032e |
children | 7e4843b7efd2 |
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 -t 'commit #0' -d '0 0' -u user + echo This is file b22 + hg commit '-tcomment #1' -d '0 0' -u user + hg update 0 + rm b + hg commit -A '-tcomment #2' -d '0 0' -u user + 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