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. tyler
