Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 715:938dd667ca21
Make annotate use option --rev instead od --revision like other commands.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Make annotate use option --rev instead od --revision like other commands.
manifest hash: fe9c9cd9d42657f60d302b557f1f33640fd51199
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC2LAwW7P1GVgWeRoRAqYKAJ4tiLIVTRN0Ot6bjrEZRc9VFrk3zwCdGx/C
PhOGWMHVlNYGZxmdXridIc4=
=J7Cn
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 16 Jul 2005 07:58:56 +0100 |
parents | d45d1c90032e |
children | 7e4843b7efd2 |
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: b aborting update spanning branches! (use update -m to perform a branch merge) + exit 0