On 2013/02/07, at 10:09, Stefan Sperling wrote: > On Thu, Feb 07, 2013 at 09:19:47AM -0500, Matthew Pounsett wrote: >> >> I've been running into unexpected tree conflicts when updating branches from >> the trunk, after reintegrating to the trunk where and file adds or removes >> were involved in the reintegrate. I expect I'm doing something wrong here, >> but I haven't been able to figure out what. Can someone point me in the >> right direction? Here's a simple example that demonstrates my issue. > > You cannot keep using the as-is branch after it has been reintegrated.
Ah, of course. Thanks very much for the references.. I'll go have another re-read. > > Please review the entire "Reintegrating a Branch" section again: > http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate > and also see the "Keeping a Reintegrated Branch Alive", which discusses > the problem in detail: > http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice > > This will be much easier in 1.8, see: > http://subversion.apache.org/docs/release-notes/1.8.html#auto-merge >
