view tests/test-merge4.out @ 450:9d785fd7deec

Get set_exec from util in convert_repo -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Get set_exec from util in convert_repo manifest hash: 82fa9db49fa56127d59a7aae70b3c0527420ddad -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCu2LTywK+sNU5EO8RAjBwAJ4+8ME5PPzQumB4u8R0zpX84tqm8QCgqhzE cd83i0X45u09mKFNFruaHYY= =9LfW -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 23 Jun 2005 17:33:07 -0800
parents 5e9e8b8d2629
children 7e4843b7efd2
line wrap: on
line source

+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -t 'commit #2' -d '0 0' -u user
+ hg update -m 1
+ rm b
+ echo This is file c22
+ hg commit -t 'commit #3' -d '0 0' -u user