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

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

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-----
mpm@selenic.com - - Load All Authors

File last commit:

r495:e94cebc6 merge default
r545:721bfca3 default
Show More
test-flags.out
75 lines | 1.8 KiB | text/plain | TextLexer
/ tests / test-flags.out
History | Annotation | Raw |Copy content |Copy permalink
+ umask 027
+ mkdir test1
+ cd test1
+ hg init
+ touch a b
+ hg add a b
+ hg ci -t 'added a b' -u test -d '0 0'
+ cd ..
+ mkdir test2
+ cd test2
+ hg init
+ hg pull ../test1
pulling from ../test1
requesting all changes
adding changesets
adding manifests
adding file revisions
modified 2 files, added 1 changesets and 2 new revisions
(run 'hg update' to get a working copy)
+ hg co
+ chmod +x a
+ hg ci -t 'chmod +x a' -u test -d '0 0'
+ cd ../test1
+ echo 123
+ hg ci -t 'a updated' -u test -d '0 0'
+ hg pull ../test2
pulling from ../test2
searching for changes
adding changesets
adding manifests
adding file revisions
modified 1 files, added 1 changesets and 1 new revisions
(run 'hg update' to get a working copy)
+ hg heads
changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1
tag: tip
parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7
user: test
date: Thu Jan 1 00:00:00 1970
summary: chmod +x a
changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
user: test
date: Thu Jan 1 00:00:00 1970
summary: a updated
+ hg history
changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1
tag: tip
parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7
user: test
date: Thu Jan 1 00:00:00 1970
summary: chmod +x a
changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
user: test
date: Thu Jan 1 00:00:00 1970
summary: a updated
changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7
user: test
date: Thu Jan 1 00:00:00 1970
summary: added a b
+ hg -dv co -m
resolving manifests
ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e
a versions differ, resolve
merging a
resolving a
file a: other 37c42bd6cc03 ancestor b80de5d13875
+ ls -l ../test1/a ../test2/a
+ cut -b 0-10
-rwxr-x---
-rwxr-x---