[SVN-4022] svn log -g interprets change in inherited mergeinfo due to move as a merge

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.8.0
• Component/s: libsvn_repos

Environment

Windows XP

• Assignee: Paul Burba
• Reporter: Dmitry Batrak
• Created: 25/Sep/11 09:59
• Updated: 27/Oct/18 16:28
• Resolved: 24/Oct/11 19:38

Description

"svn log --use-merge-history --stop-on-copy" command sometimes reports merged 
revisions erroneously.

Steps to reproduce the issue: 

Start from empty module with standard structure created under repository root: 

<repo root> 
 \-module 
   |-branches 
   |-tags 
   \-trunk 

Perform the following sequence of commands from checked out trunk: 

 echo "content" > file.txt 
 svn add file.txt 
 svn commit -m "creating file" 
 svn copy -m "creating branch" "^/module/trunk" "^/module/branches/branch" 
 svn switch "^/module/branches/branch" 
 echo "modified content" > file.txt 
 svn commit -m "modifying file in branch" 
 svn switch "^/module/trunk" 
 svn merge "^/module/branches/branch" 
 svn commit -m "merging changes from branch" 
 svn copy file.txt file-copy.txt 
 svn commit -m "copying file" 

Now the following command: 

 svn log --use-merge-history --stop-on-copy "^/module/trunk/file-copy.txt" 

produces: 

------------------------------------------------------------------------ 
r195 | WizarD | 2011-08-27 13:02:53 +0400 (Сб, 27 авг 2011) | 1 line 

copying file 
------------------------------------------------------------------------ 
r193 | WizarD | 2011-08-27 13:02:29 +0400 (Сб, 27 авг 2011) | 1 line 
Merged via: r195 

modifying file in branch 
------------------------------------------------------------------------ 
r192 | WizarD | 2011-08-27 13:02:17 +0400 (Сб, 27 авг 2011) | 1 line 
Merged via: r195 

creating branch 
------------------------------------------------------------------------ 

although no merging was performed in r195. 

The above was checked with local repository using Subversion 1.6.17 on Windows 
(1.6.17-SlikSvn-tag-1.6.17_at_1130896-WIN32).
The issue is also reproduced with Subversion 1.7.0-rc3 (CollabNet build for 
Win32), only the phrase 'Merged via' in "svn log" output is replaced with 
'Reverse merged via' in that case.

The issue was reported both on users (http://svn.haxx.se/users/
archive-2011-08/0546.shtml) and dev (http://svn.haxx.se/dev/
archive-2011-09/0399.shtml) mailing lists some time ago, but got no response 
there.