[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Svn merge URL -> URL?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-03-20 14:40:09 CET

On Sat, 2004-03-20 at 03:49, Casper Hornstrup wrote:
> Are there any technical reasons for not being able to merge changes
> without using a working copy?

Certainly... there's simply no AI good enough to know how to resolve
conflict markers automatically.

I suppose someday someone could write a feature that interactively
queries users to resolve conflicts on a server-side merge in progress.
But that's also not anything really new; a human is still ultimately
babysitting a merge happening in a temporary working copy -- the working
copy just happens to be living on the server.

---------------------------------------------------------------------
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:40:31 2004

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.