Author: stsp
Date: Wed Mar 11 14:24:20 2015
New Revision: 1665885
URL: http://svn.apache.org/r1665885
Log:
On the 1.8.x-r1660220 branch, remove an accidentally added test which
was added in error during text conflict resolution.
Modified:
subversion/branches/1.8.x-r1660220/subversion/tests/cmdline/move_tests.py
Modified:
subversion/branches/1.8.x-r1660220/subversion/tests/cmdline/move_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1660220/subversion/tests/cmdline/move_tests.py?rev=1665885&r1=1665884&r2=1665885&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1660220/subversion/tests/cmdline/move_tests.py
(original)
+++ subversion/branches/1.8.x-r1660220/subversion/tests/cmdline/move_tests.py
Wed Mar 11 14:24:20 2015
@@ -1464,148 +1464,6 @@ def move_to_from_external(sbox):
sbox.ospath(''),
sbox.ospath('GG'))
-def move_conflict_details(sbox):
- "move conflict details"
-
- sbox.build()
-
- sbox.simple_append('A/B/E/new', 'new\n')
- sbox.simple_add('A/B/E/new')
- sbox.simple_append('A/B/E/alpha', '\nextra\nlines\n')
- sbox.simple_rm('A/B/E/beta', 'A/B/F')
- sbox.simple_propset('key', 'VAL', 'A/B/E', 'A/B')
- sbox.simple_mkdir('A/B/E/new-dir1')
- sbox.simple_mkdir('A/B/E/new-dir2')
- sbox.simple_mkdir('A/B/E/new-dir3')
- sbox.simple_rm('A/B/lambda')
- sbox.simple_mkdir('A/B/lambda')
- sbox.simple_commit()
-
- sbox.simple_update('', 1)
-
- sbox.simple_move('A/B', 'B')
-
- sbox.simple_update('', 2)
-
- expected_info = [
- {
- "Moved To": re.escape(sbox.ospath("B")),
- "Tree conflict": re.escape(
- 'local dir moved away, incoming dir edit upon update' +
- ' Source left: (dir) ^/A/B@1' +
- ' Source right: (dir) ^/A/B@2')
- }
- ]
- svntest.actions.run_and_verify_info(expected_info, sbox.ospath('A/B'))
-
- sbox.simple_propset('key', 'vAl', 'B')
- sbox.simple_move('B/E/beta', 'beta')
- sbox.simple_propset('a', 'b', 'B/F', 'B/lambda')
- sbox.simple_append('B/E/alpha', 'other\nnew\nlines')
- sbox.simple_mkdir('B/E/new')
- sbox.simple_mkdir('B/E/new-dir1')
- sbox.simple_append('B/E/new-dir2', 'something')
- sbox.simple_append('B/E/new-dir3', 'something')
- sbox.simple_add('B/E/new-dir3')
-
-
- expected_output = [
- " C %s\n" % sbox.ospath('B'), # Property conflicted
- " U %s\n" % sbox.ospath('B/E'), # Just updated
- "C %s\n" % sbox.ospath('B/E/alpha'), # Text conflicted
- " C %s\n" % sbox.ospath('B/E/beta'),
- " C %s\n" % sbox.ospath('B/E/new'),
- " C %s\n" % sbox.ospath('B/E/new-dir1'),
- " C %s\n" % sbox.ospath('B/E/new-dir2'),
- " C %s\n" % sbox.ospath('B/E/new-dir3'),
- " C %s\n" % sbox.ospath('B/F'),
- " C %s\n" % sbox.ospath('B/lambda'),
- "Updated to revision 2.\n",
- "Resolved conflicted state of '%s'\n" % sbox.ospath('A/B')
- ]
- svntest.actions.run_and_verify_svn(expected_output, [],
- 'resolve', sbox.ospath('A/B'),
- '--depth', 'empty',
- '--accept', 'mine-conflict')
-
- expected_info = [
- {
- "Path" : re.escape(sbox.ospath('B')),
-
- "Conflict Properties File" :
- re.escape(sbox.ospath('B/dir_conflicts.prej')) + '.*',
- "Conflict Details": re.escape(
- 'incoming dir edit upon update' +
- ' Source left: (dir) ^/A/B@1' +
- ' Source right: (dir) ^/A/B@2')
- },
- {
- "Path" : re.escape(sbox.ospath('B/E')),
- },
- {
- "Path" : re.escape(sbox.ospath('B/E/alpha')),
- "Conflict Previous Base File" : '.*alpha.*',
- "Conflict Previous Working File" : '.*alpha.*',
- "Conflict Current Base File": '.*alpha.*',
- "Conflict Details": re.escape(
- 'incoming file edit upon update' +
- ' Source left: (file) ^/A/B/E/alpha@1' +
- ' Source right: (file) ^/A/B/E/alpha@2')
- },
- {
- "Path" : re.escape(sbox.ospath('B/E/beta')),
- "Tree conflict": re.escape(
- 'local file moved away, incoming file delete or move upon update' +
- ' Source left: (file) ^/A/B/E/beta@1' +
- ' Source right: (none) ^/A/B/E/beta@2')
- },
- {
- "Path" : re.escape(sbox.ospath('B/E/new')),
- "Tree conflict": re.escape(
- 'local dir add, incoming file add upon update' +
- ' Source left: (none) ^/A/B/E/new@1' +
- ' Source right: (file) ^/A/B/E/new@2')
- },
- {
- "Path" : re.escape(sbox.ospath('B/E/new-dir1')),
- "Tree conflict": re.escape(
- 'local dir add, incoming dir add upon update' +
- ' Source left: (none) ^/A/B/E/new-dir1@1' +
- ' Source right: (dir) ^/A/B/E/new-dir1@2')
- },
- {
- "Path" : re.escape(sbox.ospath('B/E/new-dir2')),
- "Tree conflict": re.escape(
- 'local file unversioned, incoming dir add upon update' +
- ' Source left: (none) ^/A/B/E/new-dir2@1' +
- ' Source right: (dir) ^/A/B/E/new-dir2@2')
- },
- {
- "Path" : re.escape(sbox.ospath('B/E/new-dir3')),
- "Tree conflict": re.escape(
- 'local file add, incoming dir add upon update' +
- ' Source left: (none) ^/A/B/E/new-dir3@1' +
- ' Source right: (dir) ^/A/B/E/new-dir3@2')
- },
- {
- "Path" : re.escape(sbox.ospath('B/F')),
- "Tree conflict": re.escape(
- 'local dir edit, incoming dir delete or move upon update' +
- ' Source left: (dir) ^/A/B/F@1' +
- ' Source right: (none) ^/A/B/F@2')
- },
- {
- "Path" : re.escape(sbox.ospath('B/lambda')),
- "Tree conflict": re.escape(
- 'local file edit, incoming replace with dir upon update' +
- ' Source left: (file) ^/A/B/lambda@1' +
- ' Source right: (dir) ^/A/B/lambda@2')
- },
- ]
-
- svntest.actions.run_and_verify_info(expected_info, sbox.ospath('B'),
- '--depth', 'infinity')
-
def move_conflict_markers(sbox):
"move conflict markers"
