On 07.07.2013 15:46, Daniel Shahaf wrote:
> 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?
Because changes from trunk were cherry-picked to 1.8.x, and I make a
wholesale sync from 1.8.x to the JavaHL extensions branch. The trunk
mergeinfo is inherited from the 1.8.x branch.
-- Brane
--
Branko Čibej | Director of Subversion
WANdisco // Non-Stop Data
e. brane_at_wandisco.com
Received on 2013-07-07 16:23:59 CEST