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

Re: merge problem. impossible to revert deleted file

From: Philip Martin <philip_at_codematters.co.uk>
Date: Fri, 11 Nov 2011 15:53:15 +0000

Philip Martin <philip.martin_at_wandisco.com> writes:

> The merge creates an added directory wc/D (copied from /T/D in the
> repo). This conflicts with the directory D added by the update (which
> is /X/B in the repo) so a tree conflict is created. Note that wc/D is

Typo: /X/B should be /B/D.

> marked as replaced. 

-- 
Philip
Received on 2011-11-11 16:53:54 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.