Re: Svn merge URL -> URL?

Casper Hornstrup wrote:
> Are there any technical reasons for not being able to merge changes
> without using a working copy?
>
> If the merge is done by some software automatically then checking
> out a working copy seems unnecessary.

The results of a merge usually require user verification.

If there are overlapping changes, merge will conflict, and that
requires manual resolution. And even if it does not conflict, merge
can make semantic errors. In a software project this usually means
that atleast compilation should be tested after a merge, possibly
running a test suite.

There is no real reason why a server-side merge could not be
implemented. It could perform the merge and commit, or if there are
conflicts, then error out. It could be useful for changes that are
known to not conflict.

But in practice, making such a change would probably be hard.

-- Naked

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Mar 20 14:43:22 2004