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

Server-side merge without a WC

    XMLWordPrintableJSON

    Details

    • Type: Improvement
    • Status: Open
    • Priority: Minor
    • Resolution: Unresolved
    • Affects Version/s: None
    • Fix Version/s: None
    • Component/s: None
    • Labels:
      None

      Description

      It would be useful to be able to perform a merge where the result is committed directly to the repository, without using a working copy.

      In many work flows, there are merges where the user does not require a working copy containing the result. There are also certain classes of merge that are expected to succeed trivially. Examples include most reintegration merges, and catch-up merges to a branch that has never yet been modified.

      If the merge were executed entirely on the server side, the speed benefit could be huge, and even if much or all of the work were executed on the client side the convenience could still be considerable.

      A simple design would error out on detecting any conflicts, and would not allow the user any further control. A more advanced design might allow the user to specify in advance how some potential conflicts should be automatically resolved. I do not anticipate a design that provides for interactively resolving conflicts, nor for postponing them and resuming the merge later, although such sophistications might be possible in principle.

        Attachments

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              julianfoad Julian Foad
            • Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

              • Created:
                Updated: