Author: hwright
Date: Wed Jan 11 12:21:41 2012
New Revision: 1229978
URL: http://svn.apache.org/viewvc?rev=1229978&view=rev
Log:
Ev2 shims: when building a tree to process, don't overwrite an operation if
we already have one. This is relevant when we set text after a copy, for
instance.
Current number of Ev2 test failures: 165
* subversion/libsvn_delta/compat.c
(build): Only reset the operation if it is the default of OPEN.
Modified:
subversion/trunk/subversion/libsvn_delta/compat.c
Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1229978&r1=1229977&r2=1229978&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Wed Jan 11 12:21:41 2012
@@ -1004,7 +1004,7 @@ build(struct editor_baton *eb,
{
operation->operation = OP_REPLACE;
}
- else
+ else if (operation->operation == OP_OPEN)
{
if (kind == svn_kind_file)
operation->operation = OP_OPEN;
