author | Brendan Cully <brendan@kublai.com> |
Thu, 05 Apr 2007 14:55:27 -0700 | |
changeset 4312 | 82be6af21697 |
parent 3323 | b7a46cbf3f59 |
child 4530 | 0ac7fee4f024 |
permissions | -rw-r--r-- |
3321
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
1 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
412 | 2 |
pulling from ../test1 |
3 |
requesting all changes |
|
4 |
adding changesets |
|
5 |
adding manifests |
|
775 | 6 |
adding file changes |
7 |
added 1 changesets with 2 changes to 2 files |
|
412 | 8 |
(run 'hg update' to get a working copy) |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2019
diff
changeset
|
9 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
412 | 10 |
pulling from ../test2 |
11 |
searching for changes |
|
12 |
adding changesets |
|
13 |
adding manifests |
|
775 | 14 |
adding file changes |
1043 | 15 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
16 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
17 |
changeset: 2:b833d578451e |
412 | 18 |
tag: tip |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
19 |
parent: 0:4536b1c2ca69 |
412 | 20 |
user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
21 |
date: Mon Jan 12 13:46:40 1970 +0000 |
412 | 22 |
summary: chmod +x a |
23 |
||
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
24 |
changeset: 1:a187cb361a5a |
412 | 25 |
user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
26 |
date: Mon Jan 12 13:46:40 1970 +0000 |
412 | 27 |
summary: a updated |
28 |
||
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
29 |
changeset: 2:b833d578451e |
412 | 30 |
tag: tip |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
31 |
parent: 0:4536b1c2ca69 |
412 | 32 |
user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
33 |
date: Mon Jan 12 13:46:40 1970 +0000 |
412 | 34 |
summary: chmod +x a |
35 |
||
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
36 |
changeset: 1:a187cb361a5a |
412 | 37 |
user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
38 |
date: Mon Jan 12 13:46:40 1970 +0000 |
412 | 39 |
summary: a updated |
40 |
||
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
41 |
changeset: 0:4536b1c2ca69 |
412 | 42 |
user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1922
diff
changeset
|
43 |
date: Mon Jan 12 13:46:40 1970 +0000 |
412 | 44 |
summary: added a b |
45 |
||
46 |
resolving manifests |
|
47 |
merging a |
|
1922
6d50d6189269
ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1043
diff
changeset
|
48 |
0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
6d50d6189269
ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1043
diff
changeset
|
49 |
(branch merge, don't forget to commit) |
3321
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
50 |
pulling from ../test2 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
51 |
searching for changes |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
52 |
adding changesets |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
53 |
adding manifests |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
54 |
adding file changes |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
55 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
56 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
57 |
changeset: 2:b833d578451e |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
58 |
tag: tip |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
59 |
parent: 0:4536b1c2ca69 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
60 |
user: test |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
61 |
date: Mon Jan 12 13:46:40 1970 +0000 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
62 |
summary: chmod +x a |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
63 |
|
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
64 |
changeset: 1:d54568174d8e |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
65 |
user: test |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
66 |
date: Mon Jan 12 13:46:40 1970 +0000 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
67 |
summary: b updated |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
68 |
|
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
69 |
changeset: 2:b833d578451e |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
70 |
tag: tip |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
71 |
parent: 0:4536b1c2ca69 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
72 |
user: test |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
73 |
date: Mon Jan 12 13:46:40 1970 +0000 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
74 |
summary: chmod +x a |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
75 |
|
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
76 |
changeset: 1:d54568174d8e |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
77 |
user: test |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
78 |
date: Mon Jan 12 13:46:40 1970 +0000 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
79 |
summary: b updated |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
80 |
|
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
81 |
changeset: 0:4536b1c2ca69 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
82 |
user: test |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
83 |
date: Mon Jan 12 13:46:40 1970 +0000 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
84 |
summary: added a b |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
85 |
|
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
86 |
resolving manifests |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
87 |
getting a |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
88 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
89 |
(branch merge, don't forget to commit) |
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
|
90 |
-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
|
91 |
-rwxr-x--- |
3321
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
92 |
-rwxr-x--- |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
93 |
rev offset length base linkrev nodeid p1 p2 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
94 |
0 0 0 0 0 b80de5d13875 000000000000 000000000000 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
95 |
1 0 0 0 2 37c42bd6cc03 b80de5d13875 000000000000 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
96 |
rev offset length base linkrev nodeid p1 p2 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
97 |
0 0 0 0 0 b80de5d13875 000000000000 000000000000 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
98 |
1 0 0 0 1 37c42bd6cc03 b80de5d13875 000000000000 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
99 |
rev offset length base linkrev nodeid p1 p2 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
100 |
0 0 0 0 0 b80de5d13875 000000000000 000000000000 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
101 |
1 0 5 1 1 7fe919cc0336 b80de5d13875 000000000000 |
455109df3669
extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2175
diff
changeset
|
102 |
2 5 0 2 2 37c42bd6cc03 b80de5d13875 000000000000 |