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

merge -cA,B with --accept option aborts if rA conflicts

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: trunk
    • Fix Version/s: 1.8.0
    • Component/s: unknown
    • Labels:
      None

      Description

      If multiple revisions are merged with the -c option, and an --accept option is
      specified to auto-resolve conflicts, svn merge currently aborts the merge early
      if one of the revisions conflicts. The merge should continue instead.
      

        Attachments

          Activity

            People

            • Assignee:
              julianfoad Julian Foad
              Reporter:
              stsp Stefan Sperling
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: