[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: Stefan Sperling <stsp_at_elego.de>
Date: Sun, 13 Nov 2011 14:28:30 +0100

On Sat, Nov 12, 2011 at 06:53:54PM +0100, Gunnar Dalsnes wrote:
> 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.

The tree conflict cannot be avoided at present.

Your suggestion to "disable tree conflicts for dirs" really boils
down to one particular way of resolving the conflict. Someone else
might prefer a different resolution. For instance, they might want to
rename one of the dirs after the merge to have the two new directories

For now, you will have to somehow resolve the conflict using svn commands.
We are planning to add interactive resolution menus for tree conflicts.
But there is still a lot of work to do before this will become reality.
You're welcome to pitch in and help us out with development efforts
towards this goal.
Received on 2011-11-13 14:29:14 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.