Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 540:53872e2be33a
TODO tweaks
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
TODO tweaks
manifest hash: 7b4c0443e17f1d848b7b7c9fe62407bf80c0a874
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxO9gywK+sNU5EO8RAisZAJwJPvdoKuL12u+C0+RLD7A+coQrIgCgsiNQ
+Kml7VZ5cyCaZNCGgFYSemg=
=hIqs
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Thu, 30 Jun 2005 23:23:12 -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