[SVN-2813] Makes remaining test failures pass on Windows.

• Type: Bug
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.5.0
• Component/s: contrib/svnmerge.py
• Assignee: Subversion Importer
• Reporter: Subversion Importer
• Created: 10/Jul/07 20:29
• Updated: 27/Oct/18 16:29
• Resolved: 19/Sep/12 16:26

Description

This patch, in combination that posted on issue #2810
(http://subversion.tigris.org/issues/show_bug.cgi?id=2810) makes all the tests
pass, on linux (suse 10.0) and windows (xp). 

The failures were all in running on Windows, mostly line terminator differences.
 Also one due to a regular expression not accounting for
line terminator differences, and another due to quoted arguments being
broken up because of spaces, unless they are in double-quotes.  All are
now fixed.

This frankly feels a bit kludgy and perhaps continued discussion on the list
will lead to something better. 

The detailed original posting of this, with explanation, is at:
http://www.orcaware.com/pipermail/svnmerge/2007-July/000961.html

Possible log comment:

[[[
Fix so tests will pass on Windows.

* contrib/client‑side/svnmerge/svnmerge.py
  (fix_line_terminators): New function. 
  (action_merge, action_block, action_unblock, action_rollback,
action_uninit): Change all line terminators to unix-style before writing
svnmerge-commit-message.txt files.

* contrib/client‑side/svnmerge/svnmerge_test.py
  (testTransitiveMerge): Use double-quotes around checkin comments
with whitespace so they aren't broken up by Windows into separate
parameters.
  (testInitAndRollback): Fix regular expression to allow for non-unix
line terminators.

Patch by:  Luke Call <[e-mail]>
Reviewed by: ?
]]]

Original issue reported by lacall