Mercurial > hg

annotate tests/test-flags.out @ 11549:935c83ce9172

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
inotify: Port of the C module to py3k. This patch accomplishes the port of the inotify C module to py3k by #including mercurial's util.h file, and by defining the necessary boilerplate code required by py3k through conditional compilation.
author Renato Cunha <renatoc@gmail.com>
date Fri, 02 Jul 2010 16:22:59 -0300
parents a3d73b3e1f8a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 6338
diff changeset
1 updating to branch default
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
3 pulling from ../test1
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
4 requesting all changes
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
5 adding changesets
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
6 adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset
7 adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset
8 added 1 changesets with 2 changes to 2 files
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
9 (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
10 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
4530
0ac7fee4f024 Make sure the changelog mentions files whose flags changed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3323
diff changeset
11 % the changelog should mention file a:
0ac7fee4f024 Make sure the changelog mentions files whose flags changed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3323
diff changeset
12 a
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
13 pulling from ../test2
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
14 searching for changes
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
15 adding changesets
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
16 adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset
17 adding file changes
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
18 added 1 changesets with 0 changes to 0 files (+1 heads)
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset
19 (run 'hg heads' to see heads, 'hg merge' to merge)
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
20 changeset: 2:37dccb76c058
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
21 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
22 parent: 0:4536b1c2ca69
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
23 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
24 date: Mon Jan 12 13:46:40 1970 +0000
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
25 summary: chmod +x a
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
26
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
27 changeset: 1:a187cb361a5a
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
28 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
29 date: Mon Jan 12 13:46:40 1970 +0000
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
30 summary: a updated
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
31
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
32 changeset: 2:37dccb76c058
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
33 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
34 parent: 0:4536b1c2ca69
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
35 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
36 date: Mon Jan 12 13:46:40 1970 +0000
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
37 summary: chmod +x a
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
38
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
39 changeset: 1:a187cb361a5a
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
40 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
41 date: Mon Jan 12 13:46:40 1970 +0000
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
42 summary: a updated
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
43
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
44 changeset: 0:4536b1c2ca69
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
45 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
46 date: Mon Jan 12 13:46:40 1970 +0000
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
47 summary: added a b
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
48
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
49 resolving manifests
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
50 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1922
6d50d6189269 ui: output the number of file updated/merged/removed/... on update
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1043
diff changeset
51 (branch merge, don't forget to commit)
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
52 pulling from ../test2
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
53 searching for changes
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
54 adding changesets
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
55 adding manifests
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
56 adding file changes
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
57 added 1 changesets with 0 changes to 0 files (+1 heads)
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
58 (run 'hg heads' to see heads, 'hg merge' to merge)
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
59 changeset: 2:37dccb76c058
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
60 tag: tip
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
61 parent: 0:4536b1c2ca69
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
62 user: test
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
63 date: Mon Jan 12 13:46:40 1970 +0000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
64 summary: chmod +x a
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
65
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
66 changeset: 1:d54568174d8e
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
67 user: test
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
68 date: Mon Jan 12 13:46:40 1970 +0000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
69 summary: b updated
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
70
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
71 changeset: 2:37dccb76c058
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
72 tag: tip
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
73 parent: 0:4536b1c2ca69
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
74 user: test
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
75 date: Mon Jan 12 13:46:40 1970 +0000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
76 summary: chmod +x a
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
77
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
78 changeset: 1:d54568174d8e
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
79 user: test
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
80 date: Mon Jan 12 13:46:40 1970 +0000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
81 summary: b updated
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
82
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
83 changeset: 0:4536b1c2ca69
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
84 user: test
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
85 date: Mon Jan 12 13:46:40 1970 +0000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
86 summary: added a b
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
87
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
88 resolving manifests
4531
b51a8138292a Avoid extra filelogs entries.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4530
diff changeset
89 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
90 (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
91 -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
92 -rwxr-x---
3321
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
93 -rwxr-x---
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
94 rev offset length base linkrev nodeid p1 p2
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
95 0 0 0 0 0 b80de5d13875 000000000000 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 rev offset length base linkrev nodeid p1 p2
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
99 0 0 0 0 0 b80de5d13875 000000000000 000000000000
455109df3669 extend test-flags
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2175
diff changeset
100 1 0 5 1 1 7fe919cc0336 b80de5d13875 000000000000