Index: subversion/tests/cmdline/merge_tests.py
===================================================================
--- subversion/tests/cmdline/merge_tests.py	(revision 28522)
+++ subversion/tests/cmdline/merge_tests.py	(working copy)
@@ -9926,19 +9926,26 @@
   ABE_COPY_path = os.path.join(wc_dir, 'A', 'B', 'E_COPY')
   alpha_path = os.path.join(wc_dir, 'A', 'B', 'E', 'alpha')
   alpha_fb_path = os.path.join(wc_dir, 'A', 'B', 'E_COPY', 'alpha')
+  beta_path = os.path.join(wc_dir, 'A', 'B', 'E', 'beta')
+  beta_fb_path = os.path.join(wc_dir, 'A', 'B', 'E_COPY', 'beta')
 
   file_content = "line1 \nline2 \nline3 \nline4 \nline5 \n"
 
   # We'll consider A/B/E as the trunk
-  # Modify alpha contents
+  # Set first property on beta in trunk
+  svntest.main.run_svn(None, 'propset', 'prop1', 'val1', beta_path)
 
-  # Set first property on alpha
-  svntest.main.run_svn(None, 'propset', 'prop1', 'val1', alpha_path)
-
+  # Modify alpha contents in trunk
   svntest.main.file_write(alpha_path, file_content)
-  expected_output = wc.State(wc_dir, {'A/B/E/alpha' : Item(verb='Sending')})
+  expected_output = wc.State(wc_dir, {
+    'A/B/E/alpha' : Item(verb='Sending'),
+    'A/B/E/beta'  : Item(verb='Sending'),
+    })
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
-  expected_status.add({'A/B/E/alpha'     : Item(status='  ', wc_rev=2)})
+  expected_status.add({
+    'A/B/E/alpha'     : Item(status='  ', wc_rev=2),
+    'A/B/E/beta'      : Item(status='  ', wc_rev=2),
+    })
   svntest.actions.run_and_verify_commit(wc_dir, expected_output,
                                         expected_status, None, None, None,
                                         None, None, wc_dir)
@@ -10034,9 +10041,9 @@
     })
   expected_disk = wc.State('', {
     ''         : Item(props={SVN_PROP_MERGE_INFO : '/A/B/E:3-5'}),
-    'beta'     : Item("This is the file 'beta'.\n"),
-    'alpha'    : Item(props={'prop1' : 'val1'},
-                      contents="fbline1 \ntline2 \nline3 \nline4 \nline5 \n"),
+    'beta'     : Item(props={'prop1' : 'val1'},
+                      contents="This is the file 'beta'.\n"),
+    'alpha'    : Item("fbline1 \ntline2 \nline3 \nline4 \nline5 \n")
     })
   expected_skip = wc.State(short_ABE_COPY, {})
 
@@ -10064,9 +10071,9 @@
     })
   expected_disk = wc.State('', {
     ''         : Item(props={SVN_PROP_MERGE_INFO : '/A/B/E:3-5,7'}),
-    'beta'     : Item("This is the file 'beta'.\n"),
-    'alpha'    : Item(props={'prop1' : 'val1'},
-                      contents="fbline1 \ntline2 \nline3 \ntline4 \nline5 \n"),
+    'beta'     : Item(props={'prop1' : 'val1'},
+                      contents="This is the file 'beta'.\n"),
+    'alpha'    : Item("fbline1 \ntline2 \nline3 \ntline4 \nline5 \n"),
     })
   expected_skip = wc.State(short_ABE_COPY, {})
 
@@ -10082,20 +10089,21 @@
   # Do a local modification to alpha in feature branch
   svntest.main.file_substitute(alpha_fb_path, "line5 ", "adhoc fbline5 ")
 
-  # Set second property on alpha
-  svntest.main.run_svn(None, 'propset', 'prop2', 'val2', alpha_fb_path)
+  # Set second property on beta in feature branch
+  svntest.main.run_svn(None, 'propset', 'prop2', 'val2', beta_fb_path)
 
   # Commit the merged changes along with the local modifications ie., r8
   expected_output = wc.State(wc_dir, {
     'A/B/E_COPY'       : Item(verb='Sending'),
     'A/B/E_COPY/alpha' : Item(verb='Sending'),
+    'A/B/E_COPY/beta'  : Item(verb='Sending'),
     })
   expected_status = svntest.actions.get_virginal_state(wc_dir, 7)
   expected_status.add({
     'A/B/E/alpha'          : Item(status='  ', wc_rev=7),
     'A/B/E_COPY/alpha'     : Item(status='  ', wc_rev=8),
     'A/B/E_COPY'           : Item(status='  ', wc_rev=8),
-    'A/B/E_COPY/beta'      : Item(status='  ', wc_rev=7),
+    'A/B/E_COPY/beta'      : Item(status='  ', wc_rev=8),
     })
   svntest.actions.run_and_verify_commit(wc_dir, expected_output,
                                         expected_status, None, None, None,
@@ -10108,20 +10116,19 @@
   # Merge /A/B/E_COPY to /A/B/E ie., feature branch back to trunk
   expected_output = wc.State(short_ABE, {
     ''         : Item(status=' G'),
-    'alpha'    : Item(status='GU'),
+    'alpha'    : Item(status='G '),
     })
   expected_status = wc.State(short_ABE, {
     ''         : Item(status=' M', wc_rev=7),
-    'alpha'    : Item(status='MM', wc_rev=7),
-    'beta'     : Item(status='  ', wc_rev=7),
+    'alpha'    : Item(status='M ', wc_rev=7),
+    'beta'     : Item(status=' M', wc_rev=7),
     })
   expected_disk = wc.State('', {
     ''         : Item(props={
                      SVN_PROP_MERGE_INFO : '/A/B/E:3-5,7\n/A/B/E_COPY:3-8\n'}),
-    'beta'     : Item("This is the file 'beta'.\n"),
-    'alpha'    : Item(props={'prop1' : 'val1', 'prop2' : 'val2'},
-                      contents=\
-                      "fbline1 \ntline2 \ntline3 \ntline4 \nadhoc fbline5 \n"),
+    'beta'     : Item(props={'prop1' : 'val1', 'prop2' : 'val2'},
+                      contents="This is the file 'beta'.\n"),
+    'alpha'    : Item("fbline1 \ntline2 \ntline3 \ntline4 \nadhoc fbline5 \n"),
     })
   expected_skip = wc.State(short_ABE, {})