Mercurial > hg

annotate tests/test-flags.out @ 486:098d1f039c18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove stdint.h from mpatch and bdiff -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove stdint.h from mpatch and bdiff It's only there for ntohl and htonl and should be pulled in by in.h. manifest hash: 65954290279241ac92c9ce04c21cf1a3c9dd54e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwD8KywK+sNU5EO8RAhv2AJ40R/T72XK63IbeEFqMLSRJbRJWdACcDa9r dOL9XpyYxR09REbAHw0JrlE= =8wkZ -----END PGP SIGNATURE-----
author mpm@selenic.com
date Mon, 27 Jun 2005 10:01:46 -0800
parents 291a62848f54
children 66eb9905d0a2 e94cebc60d96
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
1 pulling from ../test1
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
2 requesting all changes
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
3 adding changesets
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
4 adding manifests
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
5 adding file revisions
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
6 modified 2 files, added 1 changesets and 2 new revisions
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
7 (run 'hg update' to get a working copy)
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
8 pulling from ../test2
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
9 searching for changes
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
10 adding changesets
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
11 adding manifests
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
12 adding file revisions
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
13 modified 1 files, added 1 changesets and 1 new revisions
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
14 (run 'hg update' to get a working copy)
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
15 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
16 tag: tip
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
17 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
18 user: test
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
19 date: Thu Jan 1 00:00:00 1970
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
20 summary: chmod +x a
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
21
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
22 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
23 user: test
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
24 date: Thu Jan 1 00:00:00 1970
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
25 summary: a updated
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
26
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
27 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
28 tag: tip
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
29 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
30 user: test
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
31 date: Thu Jan 1 00:00:00 1970
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
32 summary: chmod +x a
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
33
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
34 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
35 user: test
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
36 date: Thu Jan 1 00:00:00 1970
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
37 summary: a updated
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
38
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
39 changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
40 user: test
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
41 date: Thu Jan 1 00:00:00 1970
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
42 summary: added a b
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
43
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
44 resolving manifests
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
45 ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
46 a versions differ, resolve
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
47 merging a
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
48 resolving a
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
49 file a: other 37c42bd6cc03 ancestor b80de5d13875
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
50 -rwxr-xr-x
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset
51 -rwxr-xr-x