You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Andrew Reedick <An...@cbeyond.net> on 2013/05/01 22:23:57 UTC
"svn log --xml --use-merge-history ..." doesn't include
--use-merge-history in the xml output?
Is it just me or is svn log's "--xml" switch not including "--use-merge-history" information?
The text output of "svn log --use-merge-history" includes the "Merged via: r3673" information:
------------------------------------------------------------------------
r3584 | bob | 2013-04-16 15:50:48 -0400 (Tue, 16 Apr 2013) | 1 line
Merged via: r3673
Fixed flux capacitor
------------------------------------------------------------------------
whereas "svn log --xml --use-merge-history" provides no "Merged via: ..." information:
<logentry
revision="3584">
<author>bob </author>
<date>2013-04-16T19:50:48.762112Z</date>
<paths>
<path
kind="file"
action="M">/project/branches/1.1/source/foo.jcl</path>
</paths>
<msg>Fixed flux capacitor</msg>
</logentry>
This is with the svn CLI client, version 1.7.9 (r1462340)
RE: "svn log --xml --use-merge-history ..." doesn't include
--use-merge-history in the xml output?
Posted by Andrew Reedick <An...@cbeyond.net>.
> -----Original Message-----
> From: Andrew Reedick [mailto:Andrew.Reedick@cbeyond.net]
> Sent: Wednesday, May 01, 2013 4:24 PM
> To: users@subversion.apache.org
> Subject: "svn log --xml --use-merge-history ..." doesn't include --use-merge-history in the xml output?
>
> Is it just me or is svn log's "--xml" switch not including "--use-merge-history" information?
>
> The text output of "svn log --use-merge-history" includes the "Merged via: r3673" information:
> ------------------------------------------------------------------------
> r3584 | bob | 2013-04-16 15:50:48 -0400 (Tue, 16 Apr 2013) | 1 line
> Merged via: r3673
>
> Fixed flux capacitor
> ------------------------------------------------------------------------
>
> whereas "svn log --xml --use-merge-history" provides no "Merged via: ..." information:
> <logentry
> revision="3584">
> <author>bob </author>
> <date>2013-04-16T19:50:48.762112Z</date>
> <paths>
> <path
> kind="file"
> action="M">/project/branches/1.1/source/foo.jcl</path>
> </paths>
> <msg>Fixed flux capacitor</msg>
> </logentry>
Bah, never mind. In the xml, the entries for the merged revisions are sub-nodes of the logentry, e.g.
<logentry revision="3755">
<author>bob_porter</author>
<date>2013-05-01T18:43:40.613101Z</date>
<msg>comment</msg>
<logentry revision="3754">
<author>bob_slydell</author>
<date>2013-05-01T17:53:15.616621Z</date>
<msg>stock option equity sharing program</msg>
</logentry>
<logentry revision="12345">
...
</logentry>
</logentry>