Can't do much anymore. If it's restored, SVN merge operation will
actually delete the file and then restore it in my copy as well
(deleting everything on the way in). It's a major problem with SVN,
and I've hit it a couple of times before, actually losing code.
:-(
Oh well, the merge was broken anyway and JCR code no longer
compiles. It's going to take a few hours to sort things out. Maybe
sometime next week.
/Janne
On Dec 31, 2008, at 20:21 , Andrew Jaquith wrote:
Crap. Sorry about that. It was screwing up trunk builds (JSPs
actually).
What do you want me to do?
On Wed, Dec 31, 2008 at 1:15 PM, Janne Jalkanen
<[email protected]> wrote:
Thanks.
I was using that WikiContext.
Now my merges are *totally* broken.
/Janne
On Dec 31, 2008, at 19:35 , [email protected] wrote:
Author: ajaquith
Date: Wed Dec 31 09:35:36 2008
New Revision: 730422
URL: http://svn.apache.org/viewvc?rev=730422&view=rev
Log:
Bug fix: to prevent potential name clashes, removed API version of
WikiContext until we figure out what we're doing. In the interim,
there
should be only one.
Removed:
incubator/jspwiki/trunk/src/org/apache/jspwiki/api/
WikiContext.java
Modified:
incubator/jspwiki/trunk/src/org/apache/jspwiki/api/
PageFilter.java
incubator/jspwiki/trunk/src/org/apache/jspwiki/api/
WikiPlugin.java
incubator/jspwiki/trunk/src/org/apache/jspwiki/api/
WikiRenderer.java
Modified:
incubator/jspwiki/trunk/src/org/apache/jspwiki/api/PageFilter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/
apache/jspwiki/api/PageFilter.java?
rev=730422&r1=730421&r2=730422&view=diff
====================================================================
==========
--- incubator/jspwiki/trunk/src/org/apache/jspwiki/api/
PageFilter.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/jspwiki/api/
PageFilter.java Wed
Dec 31 09:35:36 2008
@@ -22,6 +22,8 @@
import java.util.Properties;
+import com.ecyrd.jspwiki.WikiContext;
+
/**
* Provides a definition for a page filter. A page filter is a
class
Modified:
incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/
apache/jspwiki/api/WikiPlugin.java?
rev=730422&r1=730421&r2=730422&view=diff
====================================================================
==========
--- incubator/jspwiki/trunk/src/org/apache/jspwiki/api/
WikiPlugin.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/jspwiki/api/
WikiPlugin.java Wed
Dec 31 09:35:36 2008
@@ -22,6 +22,8 @@
import java.util.Map;
+import com.ecyrd.jspwiki.WikiContext;
+
/**
* Defines an interface for plugins. Any instance of a wiki plugin
* should implement this interface.
Modified:
incubator/jspwiki/trunk/src/org/apache/jspwiki/api/WikiRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/
apache/jspwiki/api/WikiRenderer.java?
rev=730422&r1=730421&r2=730422&view=diff
====================================================================
==========
--- incubator/jspwiki/trunk/src/org/apache/jspwiki/api/
WikiRenderer.java
(original)
+++ incubator/jspwiki/trunk/src/org/apache/jspwiki/api/
WikiRenderer.java
Wed Dec 31 09:35:36 2008
@@ -22,6 +22,8 @@
import java.io.InputStream;
+import com.ecyrd.jspwiki.WikiContext;
+
/**
* The WikiRenderer interface provides access to the JSPWiki
rendering
* engine. The job of the WikiRenderer is to grab content in a
