author | Thomas Arendsen Hein <thomas@intevation.de> |
Mon, 27 Jun 2005 06:41:28 +0100 | |
changeset 491 | 66eb9905d0a2 |
parent 414 | 291a62848f54 |
child 495 | e94cebc60d96 |
permissions | -rw-r--r-- |
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 |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
7 |
+ hg ci -t 'added a b' -u test -d '0 0' |
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 |
|
17 |
adding file revisions |
|
18 |
modified 2 files, added 1 changesets and 2 new revisions |
|
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 |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
22 |
+ hg ci -t 'chmod +x a' -u test -d '0 0' |
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 |
66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
414
diff
changeset
|
25 |
+ hg ci -t 'a updated' -u test -d '0 0' |
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 |
|
31 |
adding file revisions |
|
32 |
modified 1 files, added 1 changesets and 1 new revisions |
|
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 |
412 | 35 |
changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 |
36 |
tag: tip |
|
37 |
parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
|
38 |
user: test |
|
39 |
date: Thu Jan 1 00:00:00 1970 |
|
40 |
summary: chmod +x a |
|
41 |
||
42 |
changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 |
|
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 |
412 | 48 |
changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 |
49 |
tag: tip |
|
50 |
parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
|
51 |
user: test |
|
52 |
date: Thu Jan 1 00:00:00 1970 |
|
53 |
summary: chmod +x a |
|
54 |
||
55 |
changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 |
|
56 |
user: test |
|
57 |
date: Thu Jan 1 00:00:00 1970 |
|
58 |
summary: a updated |
|
59 |
||
60 |
changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
|
61 |
user: test |
|
62 |
date: Thu Jan 1 00:00:00 1970 |
|
63 |
summary: added a b |
|
64 |
||
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
|
65 |
+ hg -dv co -m |
412 | 66 |
resolving manifests |
67 |
ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e |
|
68 |
a versions differ, resolve |
|
69 |
merging a |
|
70 |
resolving a |
|
71 |
file a: other 37c42bd6cc03 ancestor b80de5d13875 |
|
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
|
72 |
+ 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
|
73 |
+ 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
|
74 |
-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
|
75 |
-rwxr-x--- |