[
https://issues.apache.org/jira/browse/DERBY-5368?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13082465#comment-13082465
]
Myrna van Lunteren commented on DERBY-5368:
-------------------------------------------
Re the status for applying the patch of DERBY-5368-3.diff, I think maybe you
didn't undo the _2.diff patch? It's really strange to see a different result,
because, as Bryan said, the patch is essentially the same. In my environment,
files that in the patch have been marked for addition (A) do not actually get
svn add-ed when I apply the patch, but they do get inserted in the tree. I have
to manually svn add on them before they show up just like in the patch's stat
file. Perhaps that's what you're seeing too? If I undo a patch, I always need
to take care of physically removing the files that were added. At one point,
someone sent a little utility to undo a patch, because of issues like this.
I am puzzled about the line-ending trouble. After splitting off the ij2b.sql, I
ran the test on my machine (Windows XP), and the first time it failed, it left
the ij2b.out in the fail directory; and that's the file that I copied into the
master directory. Then I did svn add, followed by svn propset svn:eol-style
native. And the test passes on my box. I'm pretty sure I've done this before.
After Bryan's report of trouble, I just ran cygwin's dos2unix and then unix2dos
utilities on it, but diff didn't see a difference, and when I looked at it with
an editor that shows line endings I didn't see a difference either.
I'll play around with this on a linux machine, see if I get a different effect
there.
What kind of machine were you applying this on, Bryan?
> Convert tools/ij2.sql to junit
> ------------------------------
>
> Key: DERBY-5368
> URL: https://issues.apache.org/jira/browse/DERBY-5368
> Project: Derby
> Issue Type: Sub-task
> Components: Test
> Reporter: Houx Zhang
> Assignee: Houx Zhang
> Labels: gsoc2011
> Fix For: 10.9.0.0
>
> Attachments: 5368-1.patch, 5368-1.stat, DERBY-5368-2.diff,
> DERBY-5368-2.stat, DERBY-5368-3.diff
>
>
--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira
