svn commit: r1438287 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Fri Jan 25 01:08:49 2013
New Revision: 1438287

URL: http://svn.apache.org/viewvc?rev=1438287&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
  (merge_properties_on_adds): Extend test to show more of the impact.

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=1438287&r1=1438286&r2=1438287&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Jan 25 01:08:49 2013
@@ -18107,8 +18107,10 @@ def merge_properties_on_adds(sbox):
   sbox.simple_copy('A/D/G', 'G')
 
   sbox.simple_mkdir('A/D/G/M')
-  sbox.simple_add_text('QQ', 'A/D/G/file')
-  sbox.simple_propset('key', 'value', 'A/D/G/M', 'A/D/G/file')
+  sbox.simple_mkdir('A/D/G/M/N')
+  sbox.simple_add_text('QQ', 'A/D/G/file', 'A/D/G/M/file')
+  sbox.simple_propset('key', 'value',
+                      'A/D/G/M', 'A/D/G/file', 'A/D/G/M/N', 'A/D/G/M/file')
   sbox.simple_commit()
   sbox.simple_update()
 
@@ -18122,6 +18124,10 @@ def merge_properties_on_adds(sbox):
      '  key\n',
      'Properties on \'%s\':\n' % sbox.ospath('G/file'),
      '  key\n',
+     'Properties on \'%s\':\n' % sbox.ospath('G/M/N'),
+     '  key\n',
+     'Properties on \'%s\':\n' % sbox.ospath('G/M/file'),
+     '  key\n',
   ])
   svntest.actions.run_and_verify_svn(None, expected_output, [],
                                      'proplist', '-R', sbox.ospath('G'))
@@ -18131,10 +18137,15 @@ def merge_properties_on_adds(sbox):
      '  key\n',
      'Properties on \'%s\':\n' % sbox.ospath('G/file'),
      '  key\n',
+     'Properties on \'%s\':\n' % sbox.ospath('G/M/N'),
+     '  key\n',
+     'Properties on \'%s\':\n' % sbox.ospath('G/M/file'),
+     '  key\n',
   ])
 
-  # I merged M and file with history, but the result is that file has
-  # it's properties in PRISTINE, but G has not. G's properties are in ACTUAL!
+  # I merged the tree, which should include history but only the files have
+  # the properties stored in PRISTINE. All directories have the properties
+  # as local changes in ACTUAL.
   svntest.actions.run_and_verify_svn(None, expected_output, [],
                                      'proplist', '-R', sbox.ospath('G'),
                                      '-r', 'BASE')
@@ -18147,6 +18158,23 @@ def merge_properties_on_adds(sbox):
   # ### was originally designed to resolve this problem, but I can't
   # ### find a released version where this was actually implemented.
 
+  # For fun, also check the status: 'svn status' suppresses the M from AM.
+
+  # G = sbox.ospath('G')
+  # 
+  # expected_status = wc.State('G', {
+  #   ''           : Item(status=' M', wc_rev='2'),
+  #   'pi'         : Item(status='  ', wc_rev='2'),
+  #   'tau'        : Item(status='  ', wc_rev='2'),
+  #   'file'       : Item(status='A ', copied='+', wc_rev='-'), # Copied, no changes
+  #   'M'          : Item(status='A ', copied='+', wc_rev='-'), # Copied, changes
+  #   'M/file'     : Item(status='  ', copied='+', wc_rev='-'), # Copied, no changes
+  #   'M/N'        : Item(status=' M', copied='+', wc_rev='-'), # Local changes
+  #   'rho'        : Item(status='  ', wc_rev='2'),
+  # })
+  # svntest.actions.run_and_verify_status(G, expected_status)
+
+
 
 
 ########################################################################