You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Mads Pultz <mp...@vp.dk> on 2007/04/20 09:42:48 UTC
Newby question regarding merging
Hi,
I was wondering how subversion performs a merge. Is it performed by the
server or is it up to the subversion client? I mean, who performs the
logic that compares the two files and determines whether or not there is a
conflict? How is this different than how it is done by CVS?
Regards
Mads
Re: Newby question regarding merging
Posted by Andy Levy <an...@gmail.com>.
On 4/20/07, Ulrich Eckhardt <ec...@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
Re: Newby question regarding merging
Posted by Ulrich Eckhardt <ec...@satorlaser.com>.
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. The idea behind that is that you need to
test your changes anyway, so you also need local versions of the files.
Further, if you have local changes and update you WC, you in fact perform a
merge from the current WC's revision to HEAD, and that needs to be done
client-side since only the client knows the local changes.
> How is this different than how it is done by CVS?
I'm not sure, but I think the mechanism is the same. However, CVS doesn't have
pristine copies of the files in the WCs, so you need to retrieve all files
anew for comparison and merging. I'm not sure how CVS works though.
Any reason for your questions or just interest?
Uli
--
Sator Laser GmbH
Geschäftsführer: Ronald Boers, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org