##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags....
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags. manifest hash: b6c5a0bb17de794fc5822b0672af8b977bd77950 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCv5GIW7P1GVgWeRoRAimoAJ9s2RlZ3ljH8DZE2vbCmoWJX973LQCglo+s GmajRX7o3kJxY88aNGy+TNs= =TKmo -----END PGP SIGNATURE-----
mpm@selenic.com - - Load All Authors

File last commit:

r416:5e9e8b8d default
r491:66eb9905 default
Show More
test-merge4
17 lines | 350 B | text/plain | TextLexer
/ tests / test-merge4
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh -x
hg init
echo This is file a1 > a
hg add a
hg commit -t "commit #0" -d "0 0" -u user
echo This is file b1 > b
hg add b
hg commit -t "commit #1" -d "0 0" -u user
hg update 0
echo This is file c1 > c
hg add c
hg commit -t "commit #2" -d "0 0" -u user
hg update -m 1
rm b
echo This is file c22 > c
hg commit -t "commit #3" -d "0 0" -u user