view tests/test-merge5.out @ 510:7f3fc8fd427e

More fiddling with uint32_t includes for extensions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More fiddling with uint32_t includes for extensions manifest hash: 1ad16a0262e9bd2769e32c13c7fd0c7b0cd7dde7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwS+/ywK+sNU5EO8RAhK1AKCtF/57nKCc1AU+l0sR74kHhY1NCwCfSvQK QQc5i8abuGkFpU5VUBJt5XQ= =H+CX -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 28 Jun 2005 03:08:47 -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