Mercurial > hg
view tests/test-merge5.out @ 492:9bd468e36de3
Use "kill $!" to kill running background processes.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Use "kill $!" to kill running background processes.
manifest hash: 94563ef45ac0c8d15c9c827430f3d87380946434
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCv5QNW7P1GVgWeRoRAm+1AJwMopIWkvc/eG21mm/gbTrC9sCvhACePQl/
VOPdJKQxutQTCdAqA8iMzck=
=7ejv
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 27 Jun 2005 06:52:13 +0100 |
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