[SVN-4600] svn log --use-merge-history is not detecting merge status for all entries

• Type: Bug
• Status: Open
• Priority: Major
• Resolution: Unresolved
• Affects Version/s: 1.8.14, 1.9.2
• Component/s: cmdline client

Environment

OS X, Ubuntu, CentOS

• Assignee: Unassigned
• Reporter: Dan Freed
• Created: 07/Oct/15 19:54
• Updated: 07/Oct/15 19:54

Description

The command:

svn log --use-merge-history --stop-on-copy ./ will misidentify some revisions in the history as if they were not part of a merge (with the "merged via" string). This occurs when viewing output as XML as well - the affected entries are not nested in their local logentry data structure.

For example:
svn log --use-merge-history ./
------------------------------------------------------------------------
r53303 | [e-mail] | 2015-10-05 16:11:44 -0500 (Mon, 05 Oct 2015) | 1 line

MERGES FROM TRUNK /development/trunk
------------------------------------------------------------------------
r53301 | [e-mail] | 2015-10-05 15:32:54 -0500 (Mon, 05 Oct 2015) | 2 lines
Merged via: r53303

Reintegrating DLG 386356

------------------------------------------------------------------------
r53300 | [e-mail] | 2015-10-05 15:31:51 -0500 (Mon, 05 Oct 2015) | 1 line
Merged via: r53303, r53301

MERGES FROM TRUNK /development/trunk

<truncated...>

r52573 | [e-mail] | 2015-09-03 16:58:41 -0500 (Thu, 03 Sep 2015) | 2 lines
Merged via: r53303

XDS 179947

------------------------------------------------------------------------
r52563 | [e-mail] | 2015-09-03 16:19:45 -0500 (Thu, 03 Sep 2015) | 1 line
Merged via: r53303

Creating DLG 386270 from /development/trunk
------------------------------------------------------------------------
r52650 | [e-mail] | 2015-09-08 13:53:38 -0500 (Tue, 08 Sep 2015) | 1 line

MERGES FROM TRUNK /development/trunk
------------------------------------------------------------------------
r52597 | [e-mail] | 2015-09-04 13:02:16 -0500 (Fri, 04 Sep 2015) | 2 lines

DLG 386356

------------------------------------------------------------------------
r52596 | [e-mail] | 2015-09-04 12:59:53 -0500 (Fri, 04 Sep 2015) | 1 line

Creating DLG 386356 from /development/trunk
------------------------------------------------------------------------
r53297 | [e-mail] | 2015-10-05 14:23:27 -0500 (Mon, 05 Oct 2015) | 1 line

Properly re-do filecopy on resume, if the source quiesce has failed
------------------------------------------------------------------------
r53295 | [e-mail] | 2015-10-05 14:18:39 -0500 (Mon, 05 Oct 2015) | 1 line

Creating DLG 389817 from /development/trunk
------------------------------------------------------------------------

Revision r52596 came a merge from trunk at revision 53303 as did r52597 and r52650. If I only ask for the the changes in revision 53303 they are displayed correctly:

svn log --use-merge-history -c53303 ./

------------------------------------------------------------------------
r53303 | [e-mail] | 2015-10-05 16:11:44 -0500 (Mon, 05 Oct 2015) | 1 line

MERGES FROM TRUNK /development/trunk
------------------------------------------------------------------------
r53301 | [e-mail] | 2015-10-05 15:32:54 -0500 (Mon, 05 Oct 2015) | 2 lines
Merged via: r53303

Reintegrating DLG 386356

------------------------------------------------------------------------
r53300 | [e-mail] | 2015-10-05 15:31:51 -0500 (Mon, 05 Oct 2015) | 1 line
Merged via: r53303, r53301

MERGES FROM TRUNK /development/trunk

<truncated for length.....>

------------------------------------------------------------------------
r52650 | [e-mail] | 2015-09-08 13:53:38 -0500 (Tue, 08 Sep 2015) | 1 line
Merged via: r53303

MERGES FROM TRUNK /development/trunk
------------------------------------------------------------------------
r52597 | [e-mail] | 2015-09-04 13:02:16 -0500 (Fri, 04 Sep 2015) | 2 lines
Merged via: r53303

DLG 386356

------------------------------------------------------------------------
r52596 | [e-mail] | 2015-09-04 12:59:53 -0500 (Fri, 04 Sep 2015) | 1 line
Merged via: r53303

Creating DLG 386356 from /development/trunk
------------------------------------------------------------------------

Here revisions r52596, 52597, and 52650 are all correctly identified as having been merged via r53303.