Manish Khettry wrote:
To build another patch, I updated my source tree.
There was one conflict in BinaryOperatorNode (fairly
trivial) but now the main line doesn't build. Is there
something wrong in my environment?
Hi Manish,
I'm able to build, so there might be something wrong in your
environment. I built trunk on Solaris and Linux.
Regards,
--
Kristian
compile_tools_impl_mt:
[javac] Compiling 1 source file to
C:\derby\trunk\classes
[javac]
C:\derby\trunk\java\tools\org\apache\derby\impl\tools\ij\mtGrammar.j
ava:387: cannot find symbol
[javac] symbol : constructor
SimpleCharStream(java.io.InputStream,java.lang
.String,int,int)
[javac] location: class
org.apache.derby.impl.tools.ij.SimpleCharStream
[javac] try { jj_input_stream = new
SimpleCharStream(stream, encoding, 1
, 1); } catch(java.io.UnsupportedEncodingException e)
{ throw new RuntimeExcepti
on(e); }
[javac] ^
[javac]
C:\derby\trunk\java\tools\org\apache\derby\impl\tools\ij\mtGrammar.j
ava:400: cannot find symbol
[javac] symbol : method
ReInit(java.io.InputStream,java.lang.String,int,int
)
[javac] location: class
org.apache.derby.impl.tools.ij.SimpleCharStream
[javac] try { jj_input_stream.ReInit(stream,
encoding, 1, 1); } catch(ja
va.io.UnsupportedEncodingException e) { throw new
RuntimeException(e); }
[javac] ^
[javac] 2 errors
At rev 430199
--- Andrew McIntyre <[EMAIL PROTECTED]> wrote:
On 8/9/06, Daniel John Debrunner (JIRA)
<derby-dev@db.apache.org> wrote:
[
http://issues.apache.org/jira/browse/DERBY-883?page=comments#action_12427050
]
Daniel John Debrunner commented on DERBY-883:
---------------------------------------------
Darn - this patch doesn't apply cleanly for me,
about 8-10 files have conflicts, otherwise I would
have committed it.
Don't forget, svn is smarter than patch when it
comes to conflicts.
Usually you can go back to the revision the patch
was created at,
apply the patch, and roll forward to the head and
svn will merge the
changes properly. So, try:
svn up -r 425465
patch -p0 < 883.patch5.txt
svn up
andrew
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
