[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: Gunnar Dalsnes <hardon_at_online.no>
Date: Sat, 12 Nov 2011 18:53:54 +0100

On 11.11.2011 16:51, Philip Martin wrote:
> You can't revert wc/D/f without reverting the replace of wc/D.
Does this mean it's not possible to merge if the same dir is created
both in trunk and in branch? Can the "replace" of the "duplicate" dir be
avoided somehow? If not, it would be nice with an option to disable
tree-conflict for dirs, just "accepting" existing dirs with same name.

Received on 2011-11-12 18:54:30 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.