Mercurial > hgsubversion

annotate tests/fixtures/simple_branch.svndump @ 283:521d9c1bb11d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement -u/--update support when pulling. Status messages now more closely follow standard hg pull. Added generic pull tests as well as specific tests for this change.
author Martijn Pieters <mj@zopatista.com>
date Mon, 27 Apr 2009 09:39:39 -0500
parents db32dee803a8
children bb00f7ca5b8c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 SVN-fs-dump-format-version: 2
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
2
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
3 UUID: df2126f7-00ab-4d49-b42c-7e981dde0bcf
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
4
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
5 Revision-number: 0
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
6 Prop-content-length: 56
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
7 Content-length: 56
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
8
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
9 K 8
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
10 svn:date
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
11 V 27
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
12 2008-10-07T22:49:12.059692Z
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
13 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
14
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
15 Revision-number: 1
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
16 Prop-content-length: 111
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
17 Content-length: 111
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
18
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
19 K 7
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
20 svn:log
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
21 V 11
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
22 Empty dirs.
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
23 K 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
24 svn:author
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
25 V 5
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
26 durin
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
27 K 8
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
28 svn:date
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
29 V 27
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
30 2008-10-07T22:49:41.118037Z
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
31 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
32
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
33 Node-path: branches
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
34 Node-kind: dir
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
35 Node-action: add
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
36 Prop-content-length: 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
37 Content-length: 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
38
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
39 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
40
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
41
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
42 Node-path: tags
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
43 Node-kind: dir
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
44 Node-action: add
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
45 Prop-content-length: 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
46 Content-length: 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
47
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
48 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
49
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
50
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
51 Node-path: trunk
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
52 Node-kind: dir
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
53 Node-action: add
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
54 Prop-content-length: 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
55 Content-length: 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
56
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
57 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
58
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
59
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
60 Revision-number: 2
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
61 Prop-content-length: 108
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
62 Content-length: 108
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
63
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
64 K 7
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
65 svn:log
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
66 V 9
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
67 Add alpha
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
68 K 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
69 svn:author
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
70 V 5
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
71 durin
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
72 K 8
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
73 svn:date
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
74 V 27
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
75 2008-10-07T23:23:02.991743Z
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
76 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
77
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
78 Node-path: trunk/alpha
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
79 Node-kind: file
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
80 Node-action: add
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
81 Prop-content-length: 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
82 Text-content-length: 12
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
83 Text-content-md5: 3c72ebf8bbd7fa88b1fdcee5398b5a17
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
84 Content-length: 22
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
85
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
86 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
87 file: alpha
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
88
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
89
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
90 Revision-number: 3
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
91 Prop-content-length: 107
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
92 Content-length: 107
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
93
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
94 K 7
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
95 svn:log
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
96 V 8
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
97 Add beta
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
98 K 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
99 svn:author
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
100 V 5
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
101 durin
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
102 K 8
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
103 svn:date
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
104 V 27
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
105 2008-10-07T23:28:22.651398Z
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
106 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
107
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
108 Node-path: trunk/beta
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
109 Node-kind: file
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
110 Node-action: add
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
111 Prop-content-length: 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
112 Text-content-length: 13
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
113 Text-content-md5: 981d1eb5fd0bbe05354c292105944863
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
114 Content-length: 23
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
115
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
116 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
117 Data of beta
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
118
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
119
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
120 Revision-number: 4
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
121 Prop-content-length: 113
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
122 Content-length: 113
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
123
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
124 K 7
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
125 svn:log
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
126 V 13
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
127 Make a branch
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
128 K 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
129 svn:author
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
130 V 5
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
131 durin
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
132 K 8
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
133 svn:date
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
134 V 27
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
135 2008-10-08T01:35:39.984789Z
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
136 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
137
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
138 Node-path: branches/the_branch
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
139 Node-kind: dir
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
140 Node-action: add
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
141 Node-copyfrom-rev: 3
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
142 Node-copyfrom-path: trunk
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
143 Prop-content-length: 34
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
144 Content-length: 34
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
145
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
146 K 13
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
147 svn:mergeinfo
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
148 V 0
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
149
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
150 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
151
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
152