Remy Maucherat wrote: > On Fri, 2009-03-06 at 23:32 +0000, r...@apache.org wrote: >> Author: remm >> Date: Fri Mar 6 23:32:40 2009 >> New Revision: 751136 >> >> URL: http://svn.apache.org/viewvc?rev=751136&view=rev >> Log: >> - Apache Tomcat 6.0.19. >> >> Added: >> tomcat/tc6.0.x/tags/TOMCAT_6_0_19/ (props changed) >> - copied from r751135, tomcat/tc6.0.x/trunk/ >> >> Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_19/ >> ------------------------------------------------------------------------------ >> --- svn:ignore (added) >> +++ svn:ignore Fri Mar 6 23:32:40 2009 >> @@ -0,0 +1,3 @@ >> +output >> +.settings >> +build.properties >> >> Propchange: tomcat/tc6.0.x/tags/TOMCAT_6_0_19/ >> ------------------------------------------------------------------------------ >> --- svn:mergeinfo (added) >> +++ svn:mergeinfo Fri Mar 6 23:32:40 2009 >> @@ -0,0 +1 @@ >> +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921 > > The build is in the usual place in ~remm (built with a new computer, so > it's a good idea to test it), but I don't know if these weird > propchanges mean something bad.
I don't think so. They are a side effect of using "svn merge" with 1.5 clients to merge patches from trunk to 6.0.x. svn now tries to keep track of what has been merged and what hasn't so it can do a better job of future merges. Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
