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

Merge source normalization falls over when source URL history doesn't extend back as far as request range

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Critical
    • Resolution: Fixed
    • Affects Version/s: trunk
    • Fix Version/s: 1.5.0
    • Component/s: libsvn_client
    • Labels:
      None

      Description

      When performing a revisionless merge (svn merge SOURCE_URL TARGET_PATH) where
      the SOURCE_URL's history doesn't begin until after r1, the merge source
      normalization logic gets it all wrong and determines that there's nothing to merge.
      

        Attachments

        1. 1_issue-3094-patch.txt
          11 kB
          C. Michael Pilato

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              cmpilato C. Michael Pilato
            • Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: