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

Re: Update problem: Tree conflicts vs content conflicts

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-09-07 22:35:55 CEST

On Sep 7, 2005, at 12:48 PM, Philip Martin wrote:
>
> There is a similar problem if 'a' is not replaced but simply schedule
> 'D': update causes the working file to get restored, although the
> schedule 'D' remains.

This is described in issue 2282, among other things:

    http://subversion.tigris.org/issues/show_bug.cgi?id=2282

I wonder how relevant that issue is to this thread...

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 7 22:37:12 2005

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.