-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
JDime crashes without output #26
Comments
That's expected. Doing that we get a bit further. Merging your directories fails for
Hard to read but the parameter appears to be named "this"? This is invalid afaik and leads to JDime refusing to parse the file. I remember we implemented something to skip scenarios for which errors like this occur. I'll check whether we can use that here. |
Thank you for your response.
That is my goal. Do you mean JDime parses non-.java files as Java? That is not documented. Why would one want to do that?
Is JDime able to do a full merge, or do I need to use some other mechanism to merge non-Java files, in addition to JDime?
Using |
Yea, documentation could be improved. JDime can (in anything other than linebased mode) only handle Java files. Therefore, it refuses to merge files not ending in .java (or ignores these when in recursive mode). The As for the And P.S.: A note on the recursive mode: I personally don't use it for studies, I use JDime as a git merge driver. (I.e., not a lot of bug-fixing has gone into it). The recursive mode may look innocent but what's actually happening there is that JDime considers the files/directories as a tree and applies the same algorithm used for merging ASTs to find triples (or pairs in two-way mode) of files to be merged. Once these merge scenarios are found, the files are parsed and the algorithm is applied to the ASTs. |
Thank you for your helpful responses. All of this would be great to document, to prevent misunderstandings like mine in the future. |
I ran this command:
The output is in the attached file
output.txt
.output.txt
You can obtain the input files from http://homes.cs.washington.edu/~mernst/tmp33333/jdime-bug-report.zip (warning: big file).
The text was updated successfully, but these errors were encountered: