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 13:01:55 GMT
Mark,

> -----Original Message-----
> From: Mark Thomas [mailto:markt@apache.org]
> Sent: Friday, October 11, 2013 2:58 PM
> To: Tomcat Developers List
> 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
> 
> > Does anybody know why TSVN does this / what should be the correct
> content of "svn:mergeinfo"?
> 
> You merged too low down the tree. Merges should be done tomcat/trunk ->
> tomcat/7.0.x/trunk
> 
> Not a big issue. Just remove the mergeinfo from
> /tomcat/trunk/webapps/examples/websocket

Ah, I see. Thanks!


Regards,
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