Re: svn commit: r1339892 - /subversion/trunk/subversion/libsvn_fs/editor.c

2012-05-17 Thread Greg Stein
On May 17, 2012 10:38 PM, "Hyrum K Wright" wrote: > > Thanks for taking a look. It feels like all of these are issues with > the complex copies and inheriting the correct replacement revision. > The problem then lies back in the commit driver, but I don't think it > will be too hard to track down

Re: svn commit: r1339892 - /subversion/trunk/subversion/libsvn_fs/editor.c

2012-05-17 Thread Hyrum K Wright
Thanks for taking a look. It feels like all of these are issues with the complex copies and inheriting the correct replacement revision. The problem then lies back in the commit driver, but I don't think it will be too hard to track down. The blame test failure is an unrelated EOL repairing issue

Re: svn commit: r1339892 - /subversion/trunk/subversion/libsvn_fs/editor.c

2012-05-17 Thread Greg Stein
Notes: copy 29: a mixed-rev child of a copied parent that is re-copied to pick up a different source revision needs to specify that parent revision for REPLACES_REV. Since it passes SVN_INVALID_REVNUM, the existence check comes into play, and the node exists (implicitly as a result of copying the

Re: svn commit: r1339892 - /subversion/trunk/subversion/libsvn_fs/editor.c

2012-05-17 Thread Greg Stein
Hyrum, This fixes the two tree_conflict tests you mentioned, and blame 7 continues to fail. However, it introduced failures in copy 29, merge 18, and switch 33. Each one has the error that I just added. I haven't investigated yet: it could be that a different error was expected. (all this on the