You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2010/05/27 22:48:02 UTC
svn commit: r948980 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: pburba
Date: Thu May 27 20:48:02 2010
New Revision: 948980
URL: http://svn.apache.org/viewvc?rev=948980&view=rev
Log:
Follow-up to break-up of merge_tests.py in r948873.
* subversion/tests/cmdline/merge_tests.py
(merge_replace_setup): Remove, this was moved to
merge_reintegrate_tests.py in r948873.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=948980&r1=948979&r2=948980&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Thu May 27 20:48:02 2010
@@ -14431,241 +14431,6 @@ def noop_file_merge(sbox):
chi_COPY_path)
#----------------------------------------------------------------------
-def merge_replace_setup(sbox):
- "helper for merge_replace_causes_tree_conflict*()."
-
- # svntest.factory.make(sbox,r"""
- # # make a branch of A
- # svn cp $URL/A $URL/branch
- # svn up
- # # ACTIONS ON THE MERGE SOURCE (branch)
- # # various deletes of files and dirs
- # svn delete branch/mu branch/B/E branch/D/G/pi branch/D/H
- # svn ci
- # svn up
- #
- # # replacements.
- # # file-with-file
- # echo "replacement for mu" > branch/mu
- # svn add branch/mu
- # # dir-with-dir
- # svn mkdir branch/B/E
- # svn ps propname propval branch/B/E
- # # file-with-dir
- # svn mkdir branch/D/G/pi
- # svn ps propname propval branch/D/G/pi
- # # dir-with-file
- # echo "replacement for H" > branch/D/H
- # svn add branch/D/H
- # svn ci
- # """)
-
- sbox.build()
- wc_dir = sbox.wc_dir
- url = sbox.repo_url
-
- branch_B_E = os.path.join(wc_dir, 'branch', 'B', 'E')
- branch_D_G_pi = os.path.join(wc_dir, 'branch', 'D', 'G', 'pi')
- branch_D_H = os.path.join(wc_dir, 'branch', 'D', 'H')
- branch_mu = os.path.join(wc_dir, 'branch', 'mu')
- url_A = url + '/A'
- url_branch = url + '/branch'
-
- # make a branch of A
- # svn cp $URL/A $URL/branch
- expected_stdout = verify.UnorderedOutput([
- '\n',
- 'Committed revision 2.\n',
- ])
-
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'cp', url_A,
- url_branch, '-m', 'copy log')
-
- # svn up
- expected_output = svntest.wc.State(wc_dir, {
- 'branch' : Item(status='A '),
- 'branch/B' : Item(status='A '),
- 'branch/B/F' : Item(status='A '),
- 'branch/B/E' : Item(status='A '),
- 'branch/B/E/beta' : Item(status='A '),
- 'branch/B/E/alpha' : Item(status='A '),
- 'branch/B/lambda' : Item(status='A '),
- 'branch/D' : Item(status='A '),
- 'branch/D/H' : Item(status='A '),
- 'branch/D/H/psi' : Item(status='A '),
- 'branch/D/H/chi' : Item(status='A '),
- 'branch/D/H/omega' : Item(status='A '),
- 'branch/D/G' : Item(status='A '),
- 'branch/D/G/tau' : Item(status='A '),
- 'branch/D/G/pi' : Item(status='A '),
- 'branch/D/G/rho' : Item(status='A '),
- 'branch/D/gamma' : Item(status='A '),
- 'branch/C' : Item(status='A '),
- 'branch/mu' : Item(status='A '),
- })
-
- expected_disk = svntest.main.greek_state.copy()
- expected_disk.add({
- 'branch' : Item(),
- 'branch/D' : Item(),
- 'branch/D/G' : Item(),
- 'branch/D/G/rho' : Item(contents="This is the file 'rho'.\n"),
- 'branch/D/G/tau' : Item(contents="This is the file 'tau'.\n"),
- 'branch/D/G/pi' : Item(contents="This is the file 'pi'.\n"),
- 'branch/D/H' : Item(),
- 'branch/D/H/omega' : Item(contents="This is the file 'omega'.\n"),
- 'branch/D/H/chi' : Item(contents="This is the file 'chi'.\n"),
- 'branch/D/H/psi' : Item(contents="This is the file 'psi'.\n"),
- 'branch/D/gamma' : Item(contents="This is the file 'gamma'.\n"),
- 'branch/B' : Item(),
- 'branch/B/E' : Item(),
- 'branch/B/E/alpha' : Item(contents="This is the file 'alpha'.\n"),
- 'branch/B/E/beta' : Item(contents="This is the file 'beta'.\n"),
- 'branch/B/F' : Item(),
- 'branch/B/lambda' : Item(contents="This is the file 'lambda'.\n"),
- 'branch/mu' : Item(contents="This is the file 'mu'.\n"),
- 'branch/C' : Item(),
- })
-
- expected_status = actions.get_virginal_state(wc_dir, 2)
- expected_status.add({
- 'branch' : Item(status=' ', wc_rev='2'),
- 'branch/D' : Item(status=' ', wc_rev='2'),
- 'branch/D/gamma' : Item(status=' ', wc_rev='2'),
- 'branch/D/H' : Item(status=' ', wc_rev='2'),
- 'branch/D/H/omega' : Item(status=' ', wc_rev='2'),
- 'branch/D/H/chi' : Item(status=' ', wc_rev='2'),
- 'branch/D/H/psi' : Item(status=' ', wc_rev='2'),
- 'branch/D/G' : Item(status=' ', wc_rev='2'),
- 'branch/D/G/tau' : Item(status=' ', wc_rev='2'),
- 'branch/D/G/pi' : Item(status=' ', wc_rev='2'),
- 'branch/D/G/rho' : Item(status=' ', wc_rev='2'),
- 'branch/B' : Item(status=' ', wc_rev='2'),
- 'branch/B/F' : Item(status=' ', wc_rev='2'),
- 'branch/B/E' : Item(status=' ', wc_rev='2'),
- 'branch/B/E/beta' : Item(status=' ', wc_rev='2'),
- 'branch/B/E/alpha' : Item(status=' ', wc_rev='2'),
- 'branch/B/lambda' : Item(status=' ', wc_rev='2'),
- 'branch/C' : Item(status=' ', wc_rev='2'),
- 'branch/mu' : Item(status=' ', wc_rev='2'),
- })
-
- actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
-
- # ACTIONS ON THE MERGE SOURCE (branch)
- # various deletes of files and dirs
- # svn delete branch/mu branch/B/E branch/D/G/pi branch/D/H
- expected_stdout = verify.UnorderedOutput([
- 'D ' + branch_mu + '\n',
- 'D ' + os.path.join(branch_B_E, 'alpha') + '\n',
- 'D ' + os.path.join(branch_B_E, 'beta') + '\n',
- 'D ' + branch_B_E + '\n',
- 'D ' + branch_D_G_pi + '\n',
- 'D ' + os.path.join(branch_D_H, 'chi') + '\n',
- 'D ' + os.path.join(branch_D_H, 'omega') + '\n',
- 'D ' + os.path.join(branch_D_H, 'psi') + '\n',
- 'D ' + branch_D_H + '\n',
- ])
-
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'delete',
- branch_mu, branch_B_E, branch_D_G_pi, branch_D_H)
-
- # svn ci
- expected_output = svntest.wc.State(wc_dir, {
- 'branch/D/G/pi' : Item(verb='Deleting'),
- 'branch/D/H' : Item(verb='Deleting'),
- 'branch/mu' : Item(verb='Deleting'),
- 'branch/B/E' : Item(verb='Deleting'),
- })
-
- expected_status.remove('branch/mu', 'branch/D/H', 'branch/D/H/omega',
- 'branch/D/H/chi', 'branch/D/H/psi', 'branch/D/G/pi', 'branch/B/E',
- 'branch/B/E/beta', 'branch/B/E/alpha')
-
- actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
- None, wc_dir)
-
- # svn up
- expected_output = svntest.wc.State(wc_dir, {})
-
- expected_disk.remove('branch/mu', 'branch/D/H', 'branch/D/H/omega',
- 'branch/D/H/chi', 'branch/D/H/psi', 'branch/D/G/pi', 'branch/B/E',
- 'branch/B/E/alpha', 'branch/B/E/beta')
-
- expected_status.tweak(wc_rev='3')
-
- actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
-
- # replacements.
- # file-with-file
- # echo "replacement for mu" > branch/mu
- main.file_write(branch_mu, 'replacement for mu')
-
- # svn add branch/mu
- expected_stdout = ['A ' + branch_mu + '\n']
-
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'add',
- branch_mu)
-
- # dir-with-dir
- # svn mkdir branch/B/E
- expected_stdout = ['A ' + branch_B_E + '\n']
-
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mkdir',
- branch_B_E)
-
- # svn ps propname propval branch/B/E
- expected_stdout = ["property 'propname' set on '" + branch_B_E + "'\n"]
-
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
- 'propname', 'propval', branch_B_E)
-
- # file-with-dir
- # svn mkdir branch/D/G/pi
- expected_stdout = ['A ' + branch_D_G_pi + '\n']
-
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mkdir',
- branch_D_G_pi)
-
- # svn ps propname propval branch/D/G/pi
- expected_stdout = ["property 'propname' set on '" + branch_D_G_pi + "'\n"]
-
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
- 'propname', 'propval', branch_D_G_pi)
-
- # dir-with-file
- # echo "replacement for H" > branch/D/H
- main.file_write(branch_D_H, 'replacement for H')
-
- # svn add branch/D/H
- expected_stdout = ['A ' + branch_D_H + '\n']
-
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'add',
- branch_D_H)
-
- # svn ci
- expected_output = svntest.wc.State(wc_dir, {
- 'branch/D/G/pi' : Item(verb='Adding'),
- 'branch/D/H' : Item(verb='Adding'),
- 'branch/mu' : Item(verb='Adding'),
- 'branch/B/E' : Item(verb='Adding'),
- })
-
- expected_status.add({
- 'branch/D/G/pi' : Item(status=' ', wc_rev='4'),
- 'branch/D/H' : Item(status=' ', wc_rev='4'),
- 'branch/B/E' : Item(status=' ', wc_rev='4'),
- 'branch/mu' : Item(status=' ', wc_rev='4'),
- })
-
- actions.run_and_verify_commit(wc_dir, expected_output, expected_status,
- None, wc_dir)
-
- return expected_disk, expected_status
-
-#----------------------------------------------------------------------
def copy_then_replace_via_merge(sbox):
"copy then replace via merge"
# Testing issue #2690 with deleted/added/replaced files and subdirs.