On Fri, Feb 15, 2013 at 10:28 AM, Bert Huijben <b...@qqmail.nl> wrote:
> I didn't write it down, but my intention would be to auto resolve everything > within reach of the update. > > (root = root of wc) > root/trunk > root/branches > root/branches/1.6.x > root/branches/1.7.x > > svn up root/trunk > > So in this case if you update just 'trunk', any conflicts on moves within > the tree starting with trunk would be applied automatically, but a > functional update via a move from trunk to somewhere in branches/1.7.x would > cause a tree conflict. > > It is a bad example to move files between branches, but in this case it > explains the scope of the operation :) +1 This is what my expectations as a user would be as well. -- Thanks Mark Phippard http://markphip.blogspot.com/
