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

Re: web interface to subversion... (websvn/pear/svn)

From: Max Bowsher <maxb_at_ukf.net>
Date: 2004-09-23 01:23:10 CEST

Peter Valdemar Mørch wrote:
> kfogel-at-collab.net |Lists| wrote:
>> Conflict detection is server-side; conflict *resolution* is
>> client-side.
>
> But if the client can't reliably know what version the
> about-to-be-checked-in version was based on and always tells the server
> that it is based on HEAD, haven't I then removed the ability of the
> server to do conflict detection?

Yes.

What you should do is remember what the base version was. Use a cookie or a
hidden form field. Then tell the server when you come to do a commit.

Max.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 23 01:23:49 2004

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