Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-flags.out @ 3298:455109df3669

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extend test-flags
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 09 Oct 2006 21:48:44 +0200
parents b2ae81a7df29
children b7a46cbf3f59
comparison
equal deleted inserted replaced
3297:fa59d6763441 3298:455109df3669
1 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 pulling from ../test1 2 pulling from ../test1
2 requesting all changes 3 requesting all changes
3 adding changesets 4 adding changesets
4 adding manifests 5 adding manifests
5 adding file changes 6 adding file changes
45 resolving manifests 46 resolving manifests
46 merging a 47 merging a
47 resolving a 48 resolving a
48 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 49 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
49 (branch merge, don't forget to commit) 50 (branch merge, don't forget to commit)
51 pulling from ../test2
52 searching for changes
53 adding changesets
54 adding manifests
55 adding file changes
56 added 1 changesets with 1 changes to 1 files (+1 heads)
57 (run 'hg heads' to see heads, 'hg merge' to merge)
58 changeset: 2:b833d578451e
59 tag: tip
60 parent: 0:4536b1c2ca69
61 user: test
62 date: Mon Jan 12 13:46:40 1970 +0000
63 summary: chmod +x a
64
65 changeset: 1:d54568174d8e
66 user: test
67 date: Mon Jan 12 13:46:40 1970 +0000
68 summary: b updated
69
70 changeset: 2:b833d578451e
71 tag: tip
72 parent: 0:4536b1c2ca69
73 user: test
74 date: Mon Jan 12 13:46:40 1970 +0000
75 summary: chmod +x a
76
77 changeset: 1:d54568174d8e
78 user: test
79 date: Mon Jan 12 13:46:40 1970 +0000
80 summary: b updated
81
82 changeset: 0:4536b1c2ca69
83 user: test
84 date: Mon Jan 12 13:46:40 1970 +0000
85 summary: added a b
86
87 resolving manifests
88 getting a
89 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
90 (branch merge, don't forget to commit)
50 -rwxr-x--- 91 -rwxr-x---
51 -rwxr-x--- 92 -rwxr-x---
93 -rwxr-x---
94 rev offset length base linkrev nodeid p1 p2
95 0 0 0 0 0 b80de5d13875 000000000000 000000000000
96 1 0 0 0 2 37c42bd6cc03 b80de5d13875 000000000000
97 rev offset length base linkrev nodeid p1 p2
98 0 0 0 0 0 b80de5d13875 000000000000 000000000000
99 1 0 0 0 1 37c42bd6cc03 b80de5d13875 000000000000
100 rev offset length base linkrev nodeid p1 p2
101 0 0 0 0 0 b80de5d13875 000000000000 000000000000
102 1 0 5 1 1 7fe919cc0336 b80de5d13875 000000000000
103 2 5 0 2 2 37c42bd6cc03 b80de5d13875 000000000000