Author: rhuijben
Date: Thu Feb 19 09:35:27 2015
New Revision: 1660818
URL: http://svn.apache.org/r1660818
Log:
* subversion/libsvn_wc/entries.c
(write_entry): When merging the difference between X and Y in a local
addition, don't just drop the repository location of X on importing
tree conflicts from the entries world.
Modified:
subversion/trunk/subversion/libsvn_wc/entries.c
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1660818&r1=1660817&r2=1660818&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Thu Feb 19 09:35:27 2015
@@ -1912,11 +1912,6 @@ write_entry(struct write_baton **entry_n
WRITE_ENTRY_ASSERT(conflict->kind == svn_wc_conflict_kind_tree);
- /* Fix dubious data stored by old clients, local adds don't have
- a repository URL. */
- if (conflict->reason == svn_wc_conflict_reason_added)
- conflict->src_left_version = NULL;
-
SVN_ERR(svn_wc__serialize_conflict(&new_skel, conflict,
scratch_pool, scratch_pool));
