On 5/26/16, 9:15 AM, "Christofer Dutz" <christofer.d...@c-ware.de> wrote:
> >Hi Alex, > >I had a look and the plugin doesn't offer this ... the paths seem to be >invalid ones anyway ... it seems that you copied the originals to a >directory "a" and the patched ones to one called "b" and created the >patch from that. After fixing this path-problem, I was able to apply most >of the patch. The only files that weren't able to be patched were: >- createjs/events/EventDispatcher.js >- easeljs/display/Container.js >- easeljs/display/DisplayObject.js >- easeljs/utils/SpriteSheetUtils.js > >When applying this manually IntelliJ complained about part of the patch >already being applied. Any ideas? I am using git to create and apply patches. They seem to start paths with "a" and "b". Not sure why. Every patch/diff I've worked with seems to have that. I found this page: http://maven.apache.org/plugins/maven-patch-plugin/apply-mojo.html It lists a "skip" option which I think matches the -p option that should cut directories of the paths. It also lists an "ignore-whitespace" option which the Ant build is using because EventDispatcher.js has different line endings (CRLF) than the other files. The other 3 files you mentioned may have the same issue. Is it possible for you to use those two options? -Alex
