[PATCH][merge-tracking] Fix the merge_tests.py #36

Hi All,
Find the attached patch and log.

With regards
Kamesh Jayachandran

[[[
Patch by: Kamesh Jayachandran <kamesh@collab.net>

Fix 'merge_conflict_markers_matching_eol' testcase taking care of
'merge-tracking' implementation.

* subversion/tests/cmdline/merge_tests.py
  (merge_conflict_markers_matching_eol):
   Expect to have 'prop modified' at target root.
]]]

Index: subversion/tests/cmdline/merge_tests.py
===================================================================
--- subversion/tests/cmdline/merge_tests.py (revision 21563)
+++ subversion/tests/cmdline/merge_tests.py (working copy)
@@ -3769,6 +3769,7 @@
     })
     expected_backup_status.tweak('A/mu', status='C ')
     expected_backup_status.tweak(wc_rev = cur_rev - 1)
+ expected_backup_status.tweak('', status= ' M')
 
     expected_backup_skip = wc.State('', { })
 

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 20 14:03:53 2006