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

Re: Tree conflict: local add, incoming add upon merge

From: Tyler Roscoe <tyler_at_cryptio.net>
Date: Thu, 5 Aug 2010 08:46:45 -0700

On Thu, Aug 05, 2010 at 08:56:15AM +0200, Ulrich Eckhardt wrote:
> On Wednesday 04 August 2010, Tyler Roscoe wrote:
> >
> > If there are no changes, I would delete the directory from branchx and
> > then merge from trunk to recreate the directory on branchx.
> Why not simply merge the revision where the dir was added to the trunk into
> the branch? This will obviously generate a tree conflict with the dir, plus
> perhaps some other changes. The tree conflict could be solved by reverting
> the merge operation there, all other changes including the svn:mergeinfo

I suggested deleting and re-merging because it is fewer steps and
requires less munging with mergeinfo.

Received on 2010-08-05 17:47:23 CEST

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.