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

merge of a single file into implicit `.' fails

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Fixed
    • all
    • Beta
    • unknown
    • None

    Description

      There is a regression test for this already, see merge_tests.py 5. 
      The first part of the test runs merge with an explicit wc target, and
      that works fine.  The second part tries the same merge, but inside the
      directory where the target lives, and without naming the target.  That
      fails, over all RA layers:
      
         $ cd working_copies/merge_tests_5/A/D/G/
         $ svn merge -r 1:2 schema://blah/repositories/merge_tests-5/A/D/G/rho
            [insert appropriate error here]
      
      See merge_tests.py 5 for more details.
      

      Attachments

        Activity

          People

            Unassigned Unassigned
            kfogel Karl Fogel
            Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: