[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: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-09-07 22:02:09 CEST

Philip Martin <philip@codematters.co.uk> writes:

> if the update
> replaces the file then a 'C'onflict is probably necessary.

Even this doesn't have to be a 'C'onflict: the schedule 'R' of the
old file could become a schedule 'R' of the new file. 

-- 
Philip Martin
---------------------------------------------------------------------
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:03:04 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.