Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-flags.out @ 491:66eb9905d0a2
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-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 27 Jun 2005 06:41:28 +0100 |
parents | 291a62848f54 |
children | e94cebc60d96 |
comparison
equal
deleted
inserted
replaced
490:df9b77f67998 | 491:66eb9905d0a2 |
---|---|
1 + umask 027 | |
2 + mkdir test1 | |
3 + cd test1 | |
4 + hg init | |
5 + touch a b | |
6 + hg add a b | |
7 + hg ci -t 'added a b' -u test -d '0 0' | |
8 + cd .. | |
9 + mkdir test2 | |
10 + cd test2 | |
11 + hg init | |
12 + hg pull ../test1 | |
1 pulling from ../test1 | 13 pulling from ../test1 |
2 requesting all changes | 14 requesting all changes |
3 adding changesets | 15 adding changesets |
4 adding manifests | 16 adding manifests |
5 adding file revisions | 17 adding file revisions |
6 modified 2 files, added 1 changesets and 2 new revisions | 18 modified 2 files, added 1 changesets and 2 new revisions |
7 (run 'hg update' to get a working copy) | 19 (run 'hg update' to get a working copy) |
20 + hg co | |
21 + chmod +x a | |
22 + hg ci -t 'chmod +x a' -u test -d '0 0' | |
23 + cd ../test1 | |
24 + echo 123 | |
25 + hg ci -t 'a updated' -u test -d '0 0' | |
26 + hg pull ../test2 | |
8 pulling from ../test2 | 27 pulling from ../test2 |
9 searching for changes | 28 searching for changes |
10 adding changesets | 29 adding changesets |
11 adding manifests | 30 adding manifests |
12 adding file revisions | 31 adding file revisions |
13 modified 1 files, added 1 changesets and 1 new revisions | 32 modified 1 files, added 1 changesets and 1 new revisions |
14 (run 'hg update' to get a working copy) | 33 (run 'hg update' to get a working copy) |
34 + hg heads | |
15 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 | 35 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 |
16 tag: tip | 36 tag: tip |
17 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | 37 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
18 user: test | 38 user: test |
19 date: Thu Jan 1 00:00:00 1970 | 39 date: Thu Jan 1 00:00:00 1970 |
22 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 | 42 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 |
23 user: test | 43 user: test |
24 date: Thu Jan 1 00:00:00 1970 | 44 date: Thu Jan 1 00:00:00 1970 |
25 summary: a updated | 45 summary: a updated |
26 | 46 |
47 + hg history | |
27 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 | 48 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 |
28 tag: tip | 49 tag: tip |
29 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | 50 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
30 user: test | 51 user: test |
31 date: Thu Jan 1 00:00:00 1970 | 52 date: Thu Jan 1 00:00:00 1970 |
39 changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | 60 changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
40 user: test | 61 user: test |
41 date: Thu Jan 1 00:00:00 1970 | 62 date: Thu Jan 1 00:00:00 1970 |
42 summary: added a b | 63 summary: added a b |
43 | 64 |
65 + hg -dv co -m | |
44 resolving manifests | 66 resolving manifests |
45 ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e | 67 ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e |
46 a versions differ, resolve | 68 a versions differ, resolve |
47 merging a | 69 merging a |
48 resolving a | 70 resolving a |
49 file a: other 37c42bd6cc03 ancestor b80de5d13875 | 71 file a: other 37c42bd6cc03 ancestor b80de5d13875 |
50 -rwxr-xr-x | 72 + ls -l ../test1/a ../test2/a |
51 -rwxr-xr-x | 73 + cut -b 0-10 |
74 -rwxr-x--- | |
75 -rwxr-x--- |