subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1326186 - in /subversion/branches/ev2-export: ./ subversion/libsvn_delta/compat.c
Date Sat, 14 Apr 2012 19:26:51 GMT
Author: hwright
Date: Sat Apr 14 19:26:51 2012
New Revision: 1326186

URL: http://svn.apache.org/viewvc?rev=1326186&view=rev
Log:
On the ev2-export branch:
Bring up-to-date with trunk (to pick up compat.c changes).

Modified:
    subversion/branches/ev2-export/   (props changed)
    subversion/branches/ev2-export/subversion/libsvn_delta/compat.c

Propchange: subversion/branches/ev2-export/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1326112-1326185

Modified: subversion/branches/ev2-export/subversion/libsvn_delta/compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_delta/compat.c?rev=1326186&r1=1326185&r2=1326186&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_delta/compat.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_delta/compat.c Sat Apr 14 19:26:51 2012
@@ -1644,7 +1644,25 @@ move_cb(void *baton,
         svn_revnum_t replaces_rev,
         apr_pool_t *scratch_pool)
 {
-  SVN__NOT_IMPLEMENTED();
+  struct editor_baton *eb = baton;
+
+  /* Delete the move source. */
+  SVN_ERR(build(eb, ACTION_DELETE, src_relpath, svn_kind_unknown,
+                NULL, src_revision, NULL, NULL, NULL, SVN_INVALID_REVNUM,
+                scratch_pool));
+
+  if (SVN_IS_VALID_REVNUM(replaces_rev))
+    {
+      /* We need to add the delete action for the replaced target. */
+      SVN_ERR(build(eb, ACTION_DELETE, dst_relpath, svn_kind_unknown,
+                    NULL, SVN_INVALID_REVNUM,
+                    NULL, NULL, NULL, SVN_INVALID_REVNUM, scratch_pool));
+    }
+
+  SVN_ERR(build(eb, ACTION_COPY, dst_relpath, svn_kind_unknown,
+                src_relpath, src_revision, NULL, NULL, NULL,
+                SVN_INVALID_REVNUM, scratch_pool));
+
   return SVN_NO_ERROR;
 }
 



Mime
View raw message