subversion-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Dan Freed (JIRA)" <j...@apache.org>
Subject [jira] [Created] (SVN-4600) svn log --use-merge-history is not detecting merge status for all entries
Date Wed, 07 Oct 2015 19:55:26 GMT
Dan Freed created SVN-4600:
------------------------------

             Summary: svn log --use-merge-history is not detecting merge status for all entries
                 Key: SVN-4600
                 URL: https://issues.apache.org/jira/browse/SVN-4600
             Project: Subversion
          Issue Type: Bug
          Components: cmdline client
    Affects Versions: 1.9.2, 1.8.14
         Environment: OS X, Ubuntu, CentOS
            Reporter: Dan Freed


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 | degglest@EPIC.COM | 2015-10-05 16:11:44 -0500 (Mon, 05 Oct 2015) | 1 line

MERGES FROM TRUNK /development/trunk
------------------------------------------------------------------------
r53301 | dweiner@EPIC.COM | 2015-10-05 15:32:54 -0500 (Mon, 05 Oct 2015) | 2 lines
Merged via: r53303

Reintegrating DLG 386356

------------------------------------------------------------------------
r53300 | dweiner@EPIC.COM | 2015-10-05 15:31:51 -0500 (Mon, 05 Oct 2015) | 1 line
Merged via: r53303, r53301

MERGES FROM TRUNK /development/trunk

<truncated...>


r52573 | dbillmir@EPIC.COM | 2015-09-03 16:58:41 -0500 (Thu, 03 Sep 2015) | 2 lines
Merged via: r53303

XDS 179947

------------------------------------------------------------------------
r52563 | dbillmir@EPIC.COM | 2015-09-03 16:19:45 -0500 (Thu, 03 Sep 2015) | 1 line
Merged via: r53303

Creating DLG 386270 from /development/trunk
------------------------------------------------------------------------
r52650 | dbillmir@EPIC.COM | 2015-09-08 13:53:38 -0500 (Tue, 08 Sep 2015) | 1 line

MERGES FROM TRUNK /development/trunk
------------------------------------------------------------------------
r52597 | dweiner@EPIC.COM | 2015-09-04 13:02:16 -0500 (Fri, 04 Sep 2015) | 2 lines

DLG 386356

------------------------------------------------------------------------
r52596 | dweiner@EPIC.COM | 2015-09-04 12:59:53 -0500 (Fri, 04 Sep 2015) | 1 line

Creating DLG 386356 from /development/trunk
------------------------------------------------------------------------
r53297 | degglest@EPIC.COM | 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 | degglest@EPIC.COM | 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 | degglest@EPIC.COM | 2015-10-05 16:11:44 -0500 (Mon, 05 Oct 2015) | 1 line

MERGES FROM TRUNK /development/trunk
------------------------------------------------------------------------
r53301 | dweiner@EPIC.COM | 2015-10-05 15:32:54 -0500 (Mon, 05 Oct 2015) | 2 lines
Merged via: r53303

Reintegrating DLG 386356

------------------------------------------------------------------------
r53300 | dweiner@EPIC.COM | 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 | dbillmir@EPIC.COM | 2015-09-08 13:53:38 -0500 (Tue, 08 Sep 2015) | 1 line
Merged via: r53303

MERGES FROM TRUNK /development/trunk
------------------------------------------------------------------------
r52597 | dweiner@EPIC.COM | 2015-09-04 13:02:16 -0500 (Fri, 04 Sep 2015) | 2 lines
Merged via: r53303

DLG 386356

------------------------------------------------------------------------
r52596 | dweiner@EPIC.COM | 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.




--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

Mime
View raw message