##// END OF EJS Templates
Work-around failing tests/test-bad-pull with slow bg process....
Work-around failing tests/test-bad-pull with slow bg process. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Work-around failing tests/test-bad-pull with slow bg process. Without the 'sleep 2' python dumb.py often appeared after hg clone. manifest hash: b32381ac46a7691f2a92595b650b2406853644c2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxOM+W7P1GVgWeRoRAjgTAJ9OqrikdK043Eiyyx9dG8DR1XZ7tgCggdmM AVYvAZO3P+WlaWDu3MaxEXY= =0XN5 -----END PGP SIGNATURE-----

File last commit:

r409:feadc969 default
r545:721bfca3 default
Show More
test-merge2.out
47 lines | 916 B | text/plain | TextLexer
mpm@selenic.com
Pick up tests from previous patch...
r409 + mkdir t
+ cd t
+ 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
+ rm b
+ hg update 0
+ echo This is file b2
+ hg add b
+ hg commit -t 'commit #2' -d '0 0' -u user
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ 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
+ rm b
+ hg update 0
+ echo This is file b2
+ hg commit -A -t 'commit #2' -d '0 0' -u user
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ 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
+ rm b
+ hg remove b
+ hg update 0
+ echo This is file b2
+ hg commit -A -t 'commit #2' -d '0 0' -u user
+ cd ..
+ /bin/rm -rf t