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

Re: Newby question regarding merging

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-04-20 14:58:28 CEST

On 4/20/07, Ulrich Eckhardt <eckhardt@satorlaser.com> wrote:
> On Friday 20 April 2007 11:42, Mads Pultz wrote:
> > I was wondering how subversion performs a merge. Is it performed by the
> > server or is it up to the subversion client?
>
> The client, AFAIK.
>
> > I mean, who performs the logic that compares the two files and
> > determines whether or not there is a conflict?
>
> Other than 'move' and 'mkdir', everything that creates a new revision is
> always done from a working copy.

You can copy, delete and rename (which is the same as a move, really)
using repository URLs and no working copy as well - all of which
increment the revision number.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Apr 20 14:58:45 2007

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