Hi All,
Find the attached patch and log.
With regards
Kamesh Jayachandran
[[[
r22510 added 'eol' to conflict '.prej' files.
Update the testcase in respect of the same.
* subversion/tests/cmdline/merge_tests.py
(simple_property_merges):
Append 'os.linesep' to expected '*.prej' contents.
Patch by: Kamesh Jayachandran <kamesh@collab.net>
]]]
Index: subversion/tests/cmdline/merge_tests.py
===================================================================
--- subversion/tests/cmdline/merge_tests.py (revision 22515)
+++ subversion/tests/cmdline/merge_tests.py (working copy)
@@ -778,14 +778,14 @@
expected_disk.add({
'E/dir_conflicts.prej'
: Item("Trying to change property 'foo' from 'foo_val' to 'mod_foo',\n"
- + "but the property does not exist."),
+ + "but the property does not exist." + os.linesep),
'E/alpha.prej'
: Item("Trying to change property 'foo' from 'foo_val' to 'mod_foo',\n"
- + "but the property does not exist."),
+ + "but the property does not exist." + os.linesep),
'E/beta.prej'
: Item("Trying to change property 'foo' from 'foo?\\129val' to"
+ " 'mod?\\129foo',\n"
- + "but the property does not exist."),
+ + "but the property does not exist." + os.linesep),
})
expected_disk.tweak('E', 'E/alpha', props={'bar' : 'bar_val'})
expected_disk.tweak('E/beta', props={'bar' : 'bar\201val'})
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 30 14:11:32 2006