Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 451:c9d134165392
Make lookup a bit smarter
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Make lookup a bit smarter
Handle overflow error
Handle "0000" -> nullid, not 0
manifest hash: f3af0c171216687c621fd0214efe45775e5a1d34
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCu2PrywK+sNU5EO8RArqWAJ9hafXgnHjCDE/Sxtvyo+e+qmPaGgCfR8AV
DCG3i0NasG3ItbPvux2Dm5Q=
=zjqN
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Thu, 23 Jun 2005 17:37:47 -0800 |
parents | c2b9502a4e96 |
children | d45d1c90032e |
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: aborting update spanning branches! (use update -m to perform a branch merge) + exit 0