subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1765158 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Sun, 16 Oct 2016 14:08:25 GMT
Author: stsp
Date: Sun Oct 16 14:08:25 2016
New Revision: 1765158

URL: http://svn.apache.org/viewvc?rev=1765158&view=rev
Log:
Fix a pool lifetime bug in the conflict resolver.

Fixes this text failure over ra_svn which occurred on some buildbots:
FAIL:  conflicts-test 23: merge incoming moved dir with moved file

* subversion/libsvn_client/conflicts.c
  (find_deleted_rev): Make a deep copy of copy->copyto_path for nested moves.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1765158&r1=1765157&r2=1765158&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Sun Oct 16 14:08:25 2016
@@ -880,7 +880,8 @@ find_deleted_rev(void *baton,
               /* Remember details of this move. */
               move = apr_pcalloc(b->result_pool, sizeof(*move));
               move->moved_from_repos_relpath = moved_from_repos_relpath;
-              move->moved_to_repos_relpath = copy->copyto_path;
+              move->moved_to_repos_relpath = apr_pstrdup(b->result_pool,
+                                                         copy->copyto_path);
               move->rev = log_entry->revision;
               author = svn_hash_gets(log_entry->revprops,
                                      SVN_PROP_REVISION_AUTHOR);



Mime
View raw message