tests/test-merge4.out
author mpm@selenic.com
Wed, 29 Jun 2005 10:44:16 -0800
changeset 516 873228c2f6cf
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rw-r--r--
Change getchangegroup to findincoming -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Change getchangegroup to findincoming manifest hash: 46dbdc025ead342f7c70a0051d1c596cfcbb6699 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwuwAywK+sNU5EO8RAoV/AJ9GaoLTKMo2aoycSIZyBt/8r073vQCeK/tO W1PwSot4HmnmcpR6RVIy9+0= =PiBt -----END PGP SIGNATURE-----

+ 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