Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 490:df9b77f67998
Make show_changeset show added and deleted files in verbose mode.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Make show_changeset show added and deleted files in verbose mode.
manifest hash: 189c2da64862f471b75b9d205907bff86c7423a3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCv4voW7P1GVgWeRoRAlLaAJsHGWEfNMMfDdsnk9/G9w86nf2I2QCgi4Rc
3HgiUFeTPi71I0tH+SV5Gsc=
=/see
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 27 Jun 2005 06:17:28 +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