tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Howard Lewis Ship <hls...@gmail.com>
Subject Error using Git svn
Date Thu, 31 Dec 2009 02:34:58 GMT
Anyone have some insight:

$ git svn dcommit
Committing to https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk ...
Merge conflict during commit: File or directory
'tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java'
is out of date; try updating: resource out of date; try updating at
/opt/local/libexec/git-core/git-svn line 549


I think Robert commit a few changes that may conflict ... but I can't
figure out how to merge, or even how to see if there's a conflict.
Any ideas?

$ git svn log tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
------------------------------------------------------------------------
r890915 | hlship | 2009-12-15 09:47:59 -0800 (Tue, 15 Dec 2009) | 4 lines

TAP5-815: Asset dispatcher allows any file inside the webapp visible
and downloadable.
Improve the regex used for opening the context to allow for all
context content as long as it's outside of the WEB-INF.
Improve the integration test to test for a greater variety of situations.

------------------------------------------------------------------------
r889985 | robertdzeigler | 2009-12-12 13:37:21 -0800 (Sat, 12 Dec
2009) | 3 lines

TAP5-815: Asset dispatcher allows any file inside the webapp visible
and downloadable
Further improvements to thhe context assets regex.  In addition to
WEB-INF, files at or under META-INF are blocked, as are files ending
in .tml.

------------------------------------------------------------------------
r889842 | robertdzeigler | 2009-12-11 14:39:59 -0800 (Fri, 11 Dec
2009) | 4 lines

TAP5-815: Asset dispatcher allows any file inside the webapp visible
and downloadable.
Improve the regex used for opening the context to allow for all
context content as long as it's outside of the WEB-INF.
Improve the integration test to test for a greater variety of situations.


-- 
Howard M. Lewis Ship

Creator of Apache Tapestry

The source for Tapestry training, mentoring and support. Contact me to
learn how I can get you up and productive in Tapestry fast!

(971) 678-5210
http://howardlewisship.com

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


Mime
View raw message