Hi Alex, That looks like the subversion merge tracking info. According to subversion "Subversion tries to generate merge metadata whenever it can, to make future invocations of svn merge smarter." [1] So it should be just fine.
Regards, Bart [1] http://svnbook.red-bean.com/en/1.6/svn.branchmerge.advanced.html On Fri, Oct 14, 2011 at 4:04 PM, Alex Parvulescu <[email protected]> wrote: > ok, > what is all this props change stuff? > I did a fresh checkout of jackrabbit-core 2.2, a svn merge -c 1183240 and > svn commit. > Do I need to rollback something? > alex > > On Fri, Oct 14, 2011 at 4:00 PM, <[email protected]> wrote: >> >> Author: alexparvulescu >> Date: Fri Oct 14 14:00:59 2011 >> New Revision: 1183364 >> >> URL: http://svn.apache.org/viewvc?rev=1183364&view=rev >> Log: >> JCR-3098: adjusting log levels - backport to 2.2 >> >> Modified: >> jackrabbit/branches/2.2/jackrabbit-core/ (props changed) >> >> jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/CacheManager.java >> >> Propchange: jackrabbit/branches/2.2/jackrabbit-core/ >> >> ------------------------------------------------------------------------------ >> --- svn:mergeinfo (original) >> +++ svn:mergeinfo Fri Oct 14 14:00:59 2011 >> @@ -3,4 +3,4 @@ >> /jackrabbit/sandbox/JCR-1456/jackrabbit-core:774917-886178 >> /jackrabbit/sandbox/JCR-2170/jackrabbit-core:812417-816332 >> /jackrabbit/sandbox/tripod-JCR-2209/jackrabbit-core:795441-795863 >> >> -/jackrabbit/trunk/jackrabbit-core:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,1100286,1101046,110 >> >> 2601,1104027,1128175,1130192,1130228,1132993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1157175,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1177249,1177340,1179548,1180922,1182713,1182835 >> >> +/jackrabbit/trunk/jackrabbit-core:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,1100286,1101046,110 >> >> 2601,1104027,1128175,1130192,1130228,1132993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1157175,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1177249,1177340,1179548,1180922,1182713,1182835,1183240 >> >> Modified: >> jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/CacheManager.java >> URL: >> http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/CacheManager.java?rev=1183364&r1=1183363&r2=1183364&view=diff >> >> ============================================================================== >> --- >> jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/CacheManager.java >> (original) >> +++ >> jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cache/CacheManager.java >> Fri Oct 14 14:00:59 2011 >> @@ -156,13 +156,13 @@ public class CacheManager implements Cac >> * Log info about the caches. >> */ >> private void logCacheStats() { >> - if (log.isInfoEnabled()) { >> + if (log.isDebugEnabled()) { >> long now = System.currentTimeMillis(); >> if (now < nextLogStats) { >> return; >> } >> for (Cache cache : caches.keySet()) { >> - log.info(cache.getCacheInfoAsString()); >> + log.debug(cache.getCacheInfoAsString()); >> } >> nextLogStats = now + minLogStatsInterval; >> } >> @@ -172,8 +172,8 @@ public class CacheManager implements Cac >> * Re-calculate the maximum memory for each cache, and set the new >> limits. >> */ >> private void resizeAll() { >> - if (log.isDebugEnabled()) { >> - log.debug("resizeAll size=" + caches.size()); >> + if (log.isTraceEnabled()) { >> + log.trace("resizeAll size=" + caches.size()); >> } >> // get strong references >> // entries in a weak hash map may disappear any time >> @@ -238,8 +238,8 @@ public class CacheManager implements Cac >> // set the new limit >> for (CacheInfo info : infos) { >> Cache cache = info.getCache(); >> - if (log.isDebugEnabled()) { >> - log.debug(cache + " now:" + cache.getMaxMemorySize() + " >> used:" >> + if (log.isTraceEnabled()) { >> + log.trace(cache + " now:" + cache.getMaxMemorySize() + " >> used:" >> + info.getMemoryUsed() + " access:" + >> info.getAccessCount() >> + " new:" + info.getMemory()); >> } >> >> > > -- Amsterdam - Oosteinde 11, 1017 WT Amsterdam Boston - 1 Broadway, Cambridge, MA 02142 US +1 877 414 4776 (toll free) Europe +31(0)20 522 4466 www.onehippo.com
