[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Question on mergeinfo added in r1500370 Re: svn commit: r1500370 [1/5]

From: Daniel Shahaf <danielsh_at_apache.org>
Date: Sun, 7 Jul 2013 13:46:28 +0000

On Sun, Jul 07, 2013 at 05:06:51AM -0000, brane_at_apache.org wrote:
> Author: brane
> Date: Sun Jul 7 05:06:50 2013
> New Revision: 1500370
>
> URL: http://svn.apache.org/r1500370
> Log:
> On the javahl-1.8-extensions branch: Sync JavaHL with trunk up to r1500364.
> Sync with branches/1.8.x up to r1500366.
>
> Propchange: subversion/branches/javahl-1.8-extensions/
> ------------------------------------------------------------------------------
> Merged /subversion/branches/1.8.x:r1494631-1500366
> Merged /subversion/trunk:r1478987,1480080,1481772,1481847,1489339,1490684,1491432,1491707,1492020,1492148,1492264,1493424,1493475,1493703,1493720,1494171,1494223,1494287,1494298,1494318,1494342,1494913,1494967,1495104,1495428,1495432,1495446,1495850,1496110,1496132,1496151,1496938,1496957,1497002,1497318-1497319,1497551,1497804,1498136,1498456,1498550,1498564,1499095-1499096,1499727,1500226

Why does the output show one contiguous range for 1.8.x, but a series of
cherry-picks for trunk?

Before anyone asks, it's not a mailer bug; svn shows the same:

% svn di -c 1500370 ^/subversion/branches/javahl-1.8-extensions/ --depth empty
Index: .
===================================================================
--- . (revision 1500369)
+++ . (revision 1500370)

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /subversion/branches/1.8.x:r1494631-1500366
   Merged /subversion/trunk:r1478987,1480080,1481772,1481847,1489339,1490684,149
1432,1491707,1492020,1492148,1492264,1493424,1493475,1493703,1493720,1494171,149
4223,1494287,1494298,1494318,1494342,1494913,1494967,1495104,1495428,1495432,149
5446,1495850,1496110,1496132,1496151,1496938,1496957,1497002,1497318-1497319,149
7551,1497804,1498136,1498456,1498550,1498564,1499095-1499096,1499727,1500226
Received on 2013-07-07 15:46:40 CEST

This is an archived mail posted to the Subversion Dev mailing list.