Julian Foad created SVN-4601:
--------------------------------
Summary: Server-side merge without a WC
Key: SVN-4601
URL: https://issues.apache.org/jira/browse/SVN-4601
Project: Subversion
Issue Type: Improvement
Reporter: Julian Foad
Priority: Minor
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.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
