Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-2813

Makes remaining test failures pass on Windows.

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Minor
    • Resolution: Fixed
    • Affects Version/s: trunk
    • Fix Version/s: 1.5.0
    • Component/s: contrib/svnmerge.py
    • Labels:
      None

      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 <lsuvkne@onemodel.org>
      Reviewed by: ?
      ]]]
      

      Original issue reported by lacall

        Attachments

        1. 1_svnmerge_test-fixWindowsLineTermFailures.patch
          2 kB
          Subversion Importer
        2. 2_svnmerge-fixWindowsLineTermFailures.patch
          4 kB
          Subversion Importer
        3. 3_fixWindowsLineTermFailures.patch
          4 kB
          Subversion Importer
        4. 4_fixWindowsLineTermFailures-2.patch
          3 kB
          Subversion Importer
        5. 5_fixWindowsLineTermFailures.patch
          4 kB
          Subversion Importer
        6. 6_fixWindowsLineTermFailures.patch
          3 kB
          Subversion Importer

          Activity

            People

            • Assignee:
              subversion-importer Subversion Importer
              Reporter:
              subversion-importer Subversion Importer
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: