1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
|
#!/usr/bin/env python
#
# resolve_tests.py: testing 'svn resolve'
#
# Subversion is a tool for revision control.
# See http://subversion.apache.org for more information.
#
# ====================================================================
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
######################################################################
# General modules
import shutil, sys, re, os
import time
# Our testing module
import svntest
from svntest import wc
# (abbreviation)
Item = wc.StateItem
Skip = svntest.testcase.Skip_deco
SkipUnless = svntest.testcase.SkipUnless_deco
XFail = svntest.testcase.XFail_deco
Issues = svntest.testcase.Issues_deco
Issue = svntest.testcase.Issue_deco
Wimp = svntest.testcase.Wimp_deco
from merge_tests import set_up_branch
# 'svn resolve --accept [ base | mine-full | theirs-full ]' was segfaulting
# on 1.6.x. Prior to this test, the bug was only caught by the Ruby binding
# tests, see http://svn.haxx.se/dev/archive-2010-01/0088.shtml.
def automatic_conflict_resolution(sbox):
"resolve -R --accept [base | mf | tf]"
sbox.build()
wc_dir = sbox.wc_dir
# Some paths we'll care about
A_COPY_path = os.path.join(wc_dir, "A_COPY")
psi_COPY_path = os.path.join(wc_dir, "A_COPY", "D", "H", "psi")
# Branch A to A_COPY in r2, then make some changes under 'A' in r3-6.
wc_disk, wc_status = set_up_branch(sbox)
# Make a change on the A_COPY branch such that a subsequent merge
# conflicts.
svntest.main.file_write(psi_COPY_path, "Branch content.\n")
svntest.actions.run_and_verify_svn(None, None, [],
'commit', '-m', 'log msg', wc_dir)
def do_text_conflicting_merge():
svntest.actions.run_and_verify_svn(None, None, [],
'revert', '--recursive', A_COPY_path)
svntest.actions.run_and_verify_svn(
None,
"(--- Merging r3 into .*A_COPY':\n)|"
"(C .*psi\n)|"
"(--- Recording mergeinfo for merge of r3 into .*A_COPY':\n)|"
"( U .*A_COPY\n)|"
"(Summary of conflicts:\n)|"
"( Text conflicts: 1\n)",
[], 'merge', '-c3', '--allow-mixed-revisions',
sbox.repo_url + '/A',
A_COPY_path)
# Test 'svn resolve -R --accept base'
do_text_conflicting_merge()
svntest.actions.run_and_verify_resolve([psi_COPY_path],
'-R', '--accept', 'base',
A_COPY_path)
wc_disk.tweak('A_COPY/D/H/psi', contents="This is the file 'psi'.\n")
svntest.actions.verify_disk(wc_dir, wc_disk)
# Test 'svn resolve -R --accept mine-full'
do_text_conflicting_merge()
svntest.actions.run_and_verify_resolve([psi_COPY_path],
'-R', '--accept', 'mine-full',
A_COPY_path)
wc_disk.tweak('A_COPY/D/H/psi', contents="Branch content.\n")
svntest.actions.verify_disk(wc_dir, wc_disk)
# Test 'svn resolve -R --accept theirs-full'
do_text_conflicting_merge()
svntest.actions.run_and_verify_resolve([psi_COPY_path],
'-R', '--accept', 'tf',
A_COPY_path)
wc_disk.tweak('A_COPY/D/H/psi', contents="New content")
svntest.actions.verify_disk(wc_dir, wc_disk)
#----------------------------------------------------------------------
# Test for issue #3707 'property conflicts not handled correctly by
# svn resolve'.
@Issue(3707)
@XFail()
def prop_conflict_resolution(sbox):
"resolving prop conflicts"
sbox.build()
wc_dir = sbox.wc_dir
# Some paths we'll care about
iota_path = os.path.join(wc_dir, "iota")
mu_path = os.path.join(wc_dir, "A", "mu")
gamma_path = os.path.join(wc_dir, "A", "D", "gamma")
psi_path = os.path.join(wc_dir, "A", "D", "H", "psi")
# r2 - Set property 'propname:propval' on iota, A/mu, and A/D/gamma.
svntest.actions.run_and_verify_svn(None, None, [],
'ps', 'propname', 'propval',
iota_path, mu_path, gamma_path)
svntest.actions.run_and_verify_svn(None, None, [], 'commit',
'-m', 'create some new properties',
wc_dir)
# r3 - Make some changes to the props from r2:
#
# iota : Delete property 'propname'
# A/mu : Change property 'propname' to 'incoming-conflict'
# A/D/gamma : Change property 'propname' to 'incoming-no-conflict'
svntest.actions.run_and_verify_svn(None, None, [],
'pd', 'propname', iota_path)
svntest.actions.run_and_verify_svn(None, None, [],
'ps', 'propname', 'incoming-conflict',
mu_path)
svntest.actions.run_and_verify_svn(None, None, [],
'ps', 'propname', 'incoming-no-conflict',
gamma_path)
svntest.actions.run_and_verify_svn(None, None, [],
'commit', '-m', 'delete a property',
wc_dir)
def do_prop_conflicting_up_and_resolve(resolve_accept,
resolved_deleted_prop_val_output,
resolved_edited_prop_val_output):
"""Revert the WC, update it to r2, and set the following properties:
itoa : 'propname' = 'local_edit'
'newprop' = 'new-val-no-incoming'
A/mu : 'propname' = 'local_edit'
A/D/gamma : 'propname' = 'incoming-no-conflict'
A/D/H/psi : 'newprop' = 'new-val-no-incoming'
Update the WC, postponing conflicts, then run svn resolve -R
--accept=RESOLVE_ACCEPT.
Using svn propget, check that the resolution results in the following
properties:
itoa : 'propname' = RESOLVED_EDITED_PROP_VAL_OUTPUT
'newprop' = 'new-val-no-incoming'
A/mu : 'propname' = RESOLVED_DELETED_PROP_VAL_OUTPUT
A/D/gamma : 'propname' = 'incoming-no-conflict'
A/D/H/psi : 'newprop' = 'new-val-no-incoming'
RESOLVED_DELETED_PROP_VAL_OUTPUT and RESOLVED_EDITED_PROP_VAL_OUTPUT
both follow the rules for the expected_stdout arg to
run_and_verify_svn2()"""
svntest.actions.run_and_verify_svn(None, None, [],
'revert', '--recursive', wc_dir)
svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r2', wc_dir)
# Set some properties that will conflict when we update.
svntest.actions.run_and_verify_svn(None, None, [], 'ps',
'propname', 'local_edit',
iota_path, mu_path)
# Set a property that should always merge cleanly with the update.
svntest.actions.run_and_verify_svn(None, None, [], 'ps',
'propname', 'incoming-no-conflict',
gamma_path)
# Set a property that has no update coming.
svntest.actions.run_and_verify_svn(None, None, [], 'ps',
'newprop', 'new-val-no-incoming',
psi_path,
iota_path)
# Update, postponing all conflict resolution.
svntest.actions.run_and_verify_svn(None, None, [], 'up',
'--accept=postpone', wc_dir)
svntest.actions.run_and_verify_resolve([iota_path, mu_path, gamma_path], '-R',
'--accept', resolve_accept, wc_dir)
svntest.actions.run_and_verify_svn(
'svn revolve -R --accept=' + resolve_accept + ' of prop conflict '
'not resolved as expected;',
resolved_deleted_prop_val_output, [], 'pg', 'propname', iota_path)
svntest.actions.run_and_verify_svn(
'svn revolve -R --accept=' + resolve_accept + ' of prop conflict '
'not resolved as expected;',
['new-val-no-incoming\n'], [], 'pg', 'newprop', iota_path)
svntest.actions.run_and_verify_svn(
'svn revolve -R --accept=' + resolve_accept + ' of prop conflict '
'not resolved as expected;',
resolved_edited_prop_val_output, [], 'pg', 'propname', mu_path)
svntest.actions.run_and_verify_svn(
'svn revolve -R --accept=' + resolve_accept + ' modified a '
'non-conflicted property',
['incoming-no-conflict\n'], [], 'pg', 'propname', gamma_path)
svntest.actions.run_and_verify_svn(
'svn revolve -R --accept=' + resolve_accept + ' modified a '
'non-conflicted property',
['new-val-no-incoming\n'], [], 'pg', 'newprop', psi_path)
# Test how svn resolve deals with prop conflicts and other local
# prop changes:
#
# 1) 'iota' - An incoming prop delete on a local prop modification.
# 2) 'A/mu' - An incoming prop edit on a local prop modification.
# 3) 'A/D/gamma' - An local, non-conflicted prop edit
#
# This currently fails because svn resolve --accept=[theirs-conflict |
# theirs-full] removes the conflicts, but doesn't install 'their' version
# of the conflicted properties.
do_prop_conflicting_up_and_resolve('mine-full',
['local_edit\n'],
['local_edit\n'])
do_prop_conflicting_up_and_resolve('mine-conflict',
['local_edit\n'],
['local_edit\n'])
do_prop_conflicting_up_and_resolve('working',
['local_edit\n'],
['local_edit\n'])
do_prop_conflicting_up_and_resolve('theirs-conflict',
[], # Prop deleted
['incoming-conflict\n'])
do_prop_conflicting_up_and_resolve('theirs-full',
[], # Prop deleted
['incoming-conflict\n'])
########################################################################
# Run the tests
# list all tests here, starting with None:
test_list = [ None,
automatic_conflict_resolution,
prop_conflict_resolution,
]
if __name__ == '__main__':
svntest.main.run_tests(test_list)
# NOTREACHED
### End of file.
|
