Mercurial > hgsubversion

annotate tests/fixtures/simple_branch.svndump @ 920:1be4ea4f3c0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stupid: diff with the good revision when restoring branch Converting history like: r1 create trunk r2 remove trunk r3 make some unrelated commit r4 restore trunk from r2 stupid mode would retrieve and apply the diff with r3 instead of the one with r2. All the code deciding r2 is the actual parent was already there, only the revision argument was not passed. This fixes: - test_delete_restore_trunk in comprehensive/test_stupid_pull.py - test_delete_restore_trunk_stupid in comprehensive/test_verify_and_startrev.py Tested on OSX 10.6 with macports svn-1.7.5. I can no longer test with svn-1.6.
author Patrick Mezard <patrick@mezard.eu>
date Sun, 29 Jul 2012 13:13:56 +0200
parents bb00f7ca5b8c
children
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
542
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents: 15
diff changeset
3 UUID: 3cd547df-371e-4add-bccf-aba732a2baf5
15
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
542
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents: 15
diff changeset
12 2010-02-02T21:54:11.642093Z
15
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
542
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents: 15
diff changeset
30 2010-02-02T21:54:11.673761Z
15
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
542
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents: 15
diff changeset
75 2010-02-02T21:54:12.073120Z
15
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
542
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents: 15
diff changeset
84 Text-content-sha1: f552a50b53177d35b29a4a0ab1cece918b5b5e9b
15
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
85 Content-length: 22
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
86
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
87 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
88 file: alpha
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
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
91 Revision-number: 3
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
92 Prop-content-length: 107
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
93 Content-length: 107
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
94
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
95 K 7
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
96 svn:log
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
97 V 8
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
98 Add beta
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
99 K 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
100 svn:author
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
101 V 5
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
102 durin
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
103 K 8
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
104 svn:date
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
105 V 27
542
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents: 15
diff changeset
106 2010-02-02T21:54:13.096862Z
15
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
107 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
108
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
109 Node-path: trunk/beta
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
110 Node-kind: file
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
111 Node-action: add
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
112 Prop-content-length: 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
113 Text-content-length: 13
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
114 Text-content-md5: 981d1eb5fd0bbe05354c292105944863
542
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents: 15
diff changeset
115 Text-content-sha1: 5d40e0a9ceda69f3d98d4851a6bee02c10a6e277
15
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
116 Content-length: 23
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
117
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
118 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
119 Data of beta
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
120
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
121
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
122 Revision-number: 4
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
123 Prop-content-length: 113
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
124 Content-length: 113
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
125
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
126 K 7
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
127 svn:log
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
128 V 13
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
129 Make a branch
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
130 K 10
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
131 svn:author
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
132 V 5
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
133 durin
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
134 K 8
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
135 svn:date
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
136 V 27
542
bb00f7ca5b8c Rewrite simple_branch.sh fixture from svn dump
Patrick Mezard <pmezard@gmail.com>
parents: 15
diff changeset
137 2010-02-02T21:54:16.042325Z
15
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
138 PROPS-END
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
139
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
140 Node-path: branches/the_branch
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
141 Node-kind: dir
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
142 Node-action: add
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
143 Node-copyfrom-rev: 3
db32dee803a8 Add some basic tests of branching.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
144 Node-copyfrom-path: trunk
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