Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-flags.out @ 793:445970ccf57a
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 06:43:21 +0100 |
parents | 7e4843b7efd2 853bfbf1a312 |
children | 1f9ec150a476 |
rev | line source |
---|---|
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
1 + umask 027 |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
2 + mkdir test1 |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
3 + cd test1 |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
4 + hg init |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
5 + touch a b |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
6 + hg add a b |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
705
diff
changeset
|
7 + hg ci -m 'added a b' -d '0 0' |
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
8 + cd .. |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
9 + mkdir test2 |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
10 + cd test2 |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
11 + hg init |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
12 + hg pull ../test1 |
412 | 13 pulling from ../test1 |
14 requesting all changes | |
15 adding changesets | |
16 adding manifests | |
775 | 17 adding file changes |
18 added 1 changesets with 2 changes to 2 files | |
412 | 19 (run 'hg update' to get a working copy) |
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
20 + hg co |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
21 + chmod +x a |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
705
diff
changeset
|
22 + hg ci -m 'chmod +x a' -d '0 0' |
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
23 + cd ../test1 |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
24 + echo 123 |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
705
diff
changeset
|
25 + hg ci -m 'a updated' -d '0 0' |
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
26 + hg pull ../test2 |
412 | 27 pulling from ../test2 |
28 searching for changes | |
29 adding changesets | |
30 adding manifests | |
775 | 31 adding file changes |
32 added 1 changesets with 1 changes to 1 files | |
412 | 33 (run 'hg update' to get a working copy) |
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
34 + hg heads |
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
35 changeset: 2:3ef543305655 |
412 | 36 tag: tip |
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
37 parent: 0:22a449e20da5 |
412 | 38 user: test |
39 date: Thu Jan 1 00:00:00 1970 | |
40 summary: chmod +x a | |
41 | |
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
42 changeset: 1:c6ecefc45368 |
412 | 43 user: test |
44 date: Thu Jan 1 00:00:00 1970 | |
45 summary: a updated | |
46 | |
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
47 + hg history |
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
48 changeset: 2:3ef543305655 |
412 | 49 tag: tip |
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
50 parent: 0:22a449e20da5 |
412 | 51 user: test |
52 date: Thu Jan 1 00:00:00 1970 | |
53 summary: chmod +x a | |
54 | |
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
55 changeset: 1:c6ecefc45368 |
412 | 56 user: test |
57 date: Thu Jan 1 00:00:00 1970 | |
58 summary: a updated | |
59 | |
784
853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents:
775
diff
changeset
|
60 changeset: 0:22a449e20da5 |
412 | 61 user: test |
62 date: Thu Jan 1 00:00:00 1970 | |
63 summary: added a b | |
64 | |
591 | 65 + hg -v co -m |
412 | 66 resolving manifests |
67 merging a | |
68 resolving a | |
491
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
69 + ls -l ../test1/a ../test2/a |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
70 + cut -b 0-10 |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
71 -rwxr-x--- |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
72 -rwxr-x--- |