Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 432:3b9e3d3d2810
Start using bdiff for generating deltas
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Start using bdiff for generating deltas
manifest hash: bf6ed7d17d96810b7f40b50811b104b568c64b4b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCubqVywK+sNU5EO8RAor6AKCm8Zqg0DIhLzaMPp5/GKPKk/GjKwCfbCe+
/CBmpvcTxSJofY9RE08cCVY=
=2yu2
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 22 Jun 2005 11:23:01 -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