You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/08/15 00:36:02 UTC
svn commit: r1696000 - in /subversion/trunk: notes/ subversion/libsvn_fs_x/
subversion/tests/libsvn_fs_x/
Author: stefan2
Date: Fri Aug 14 22:36:02 2015
New Revision: 1696000
URL: http://svn.apache.org/r1696000
Log:
Complete some sub-tree mergeinfo by --record-only merging revisions
r1532583, r1536949, r1545955 and r1546837 from branches/fsfs-improvements.
Those changes were syncs with /trunk and for some reason did not update
all sub-tree mergeinfo.
* notes
* subversion/libsvn_fs_x
* subversion/tests/libsvn_fs_x
Update svn:mergeinfo.
Modified:
subversion/trunk/notes/ (props changed)
subversion/trunk/subversion/libsvn_fs_x/ (props changed)
subversion/trunk/subversion/tests/libsvn_fs_x/ (props changed)
Propchange: subversion/trunk/notes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 14 22:36:02 2015
@@ -7,6 +7,7 @@
/subversion/branches/explore-wc/notes:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
/subversion/branches/file-externals/notes:871779-873302
/subversion/branches/fs-rep-sharing/notes:869036-873803
+/subversion/branches/fsfs-improvements/notes:1532583,1536949,1545955,1546837
/subversion/branches/fsfs-lock-many/notes:1571740-1577217
/subversion/branches/fsfs-pack/notes:873717-874575
/subversion/branches/fsx-1.10/notes:1658219-1694500
Propchange: subversion/trunk/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 14 22:36:02 2015
@@ -18,7 +18,7 @@
/subversion/branches/fs-rep-sharing/subversion/libsvn_fs_x:869036-873803
/subversion/branches/fsfs-format7/subversion/libsvn_fs_x:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029
/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs:1499981-1593795
-/subversion/branches/fsfs-improvements/subversion/libsvn_fs_x:1499981-1517476
+/subversion/branches/fsfs-improvements/subversion/libsvn_fs_x:1499981-1517476,1532583,1536949,1545955,1546837
/subversion/branches/fsfs-lock-many/subversion/libsvn_fs_x:1571740-1577217
/subversion/branches/fsfs-pack/subversion/libsvn_fs_x:873717-874575
/subversion/branches/fsx/subversion/libsvn_fs_x:1507845-1508040
Propchange: subversion/trunk/subversion/tests/libsvn_fs_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 14 22:36:02 2015
@@ -16,7 +16,7 @@
/subversion/branches/file-externals/subversion/tests/libsvn_fs_x:871779-873302
/subversion/branches/fs-rep-sharing/subversion/tests/libsvn_fs_x:869036-873803
/subversion/branches/fsfs-format7/subversion/tests/libsvn_fs_x:1426304,1430673,1433848,1438408,1438982,1441129,1442051,1442068,1442504,1442910,1443171,1443803,1444690,1444693,1444695,1445040,1445080,1446103,1451129,1453590,1454307,1460579,1461851,1461865,1462837,1462904,1463120,1467362,1467382,1469487,1471208,1477166,1478055,1481447,1489817,1489949,1490673-1490674,1491784,1493042,1498029
-/subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs_x:1499981-1517476
+/subversion/branches/fsfs-improvements/subversion/tests/libsvn_fs_x:1499981-1517476,1532583,1536949,1545955,1546837
/subversion/branches/fsfs-lock-many/subversion/tests/libsvn_fs_x:1571740-1577217
/subversion/branches/fsfs-pack/subversion/tests/libsvn_fs_x:873717-874575
/subversion/branches/fsx/subversion/tests/libsvn_fs_x:1507845-1508076