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

fix test failures caused by init behavior change in r22788; improve init logic



    • Bug
    • Status: Closed
    • Major
    • Resolution: Fixed
    • trunk
    • 1.5.0
    • contrib/svnmerge.py
    • None


      This patch fixes bugs caused by r23052 and r22788 which caused tests to fail. 
      r23052 added "--force" to some commands and didn't add it to the tests that
      check for commands.  The changes to address r22788, a good idea that was just
      incomplete, are more interesting.  r22788 was intended to improve "svnmerge
      init" default values for the revision range.  The patch changes how it
      calculates those default values, and related tests.  
      This seems likely to be committed.  Dustin Mitchell said "I'm happy to commit
      this patch as it stands, and since Luke is working on patches that are probably
      of higher value, I'll write some additional tests for the new behavior and
      submit them to teh list for review.  I won't commit Luke's patch immediately, so
      please speak up if you have objections."
      Related discussion: http://www.orcaware.com/pipermail/svnmerge/2007-July/000953.html

      Original issue reported by lacall


        1. 1_revise-2nd-r22788-and-tests.patch
          12 kB
          Subversion Importer
        2. 2_fix-r22788.patch
          5 kB
          Subversion Importer
        3. 3_svnmerge-automateTrunkToBranchInitScenario.patch
          8 kB
          Subversion Importer
        4. 4_usePulldomNotXml.patch
          3 kB
          Subversion Importer
        5. 5_addErrCheckingToPulldomUsage.patch
          4 kB
          Subversion Importer
        6. 6_furtherInitLogicFixesAsBegunByr22788.patch
          11 kB
          Subversion Importer
        7. 7_addNullreturnsToPulldomUsage.patch
          3 kB
          Subversion Importer
        8. 8_renameParametersToActionInit.patch
          3 kB
          Subversion Importer
        9. 9_furtherInitLogicFixesAsBegunByr22788-take3-unifiedFormat.patch
          11 kB
          Subversion Importer
        10. 10_furtherInitLogicFixesAsBegunByr22788-take3-contextFormat.patch
          12 kB
          Subversion Importer
        11. 11_furtherInitLogicFixesAsBegunByr22788-take4-contextFormat.patch
          13 kB
          Subversion Importer



            blair Blair Zajac
            subversion-importer Subversion Importer
            0 Vote for this issue
            0 Start watching this issue