tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Konstantin Preißer <kpreis...@apache.org>
Subject RE: svn commit: r1531276 - in /tomcat/tc7.0.x/trunk/webapps/examples/websocket: ./ chat.html chat.xhtml echo.html echo.xhtml index.html index.xhtml snake.html snake.xhtml
Date Fri, 11 Oct 2013 12:54:51 GMT
> -----Original Message-----
> From: kpreisser@apache.org [mailto:kpreisser@apache.org]
> Sent: Friday, October 11, 2013 2:49 PM

> Propchange: tomcat/tc7.0.x/trunk/webapps/examples/websocket/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (added)
> +++ svn:mergeinfo Fri Oct 11 12:48:38 2013
> @@ -0,0 +1 @@
> +/tomcat/trunk/webapps/examples/websocket:1156115-1157160,1157162-
> 1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-
> 1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-
> 1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-
> 1183094,1183096-
> 1187753,1187755,1187775,1187801,1187806,1187809,1187826-
[...]

Hmm, this long "mergeinfo" property doesn't seem right to me...
Note, that I was using TortoiseSVN to merge two revisions (r1524838, r1526510) from trunk,
but I have not used the "merge" feature before.

Does anybody know why TSVN does this / what should be the correct content of "svn:mergeinfo"?


Thanks,
Konstantin Preißer


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message