I just pushed FDB for Falcon. I tried various ways of merging the changes from flex-sdk and eventually gave up. It seems like the line numbers are off by 300 lines or so, so the patch utilities can’t figure out what to do. I’ve manually re-applied the patches I saw from Fred except:
df0fceaeef45569c06aaf342fa9ba6e9c4d7efb5 which is implemented differently (in the Reducer). I could certainly have messed things up, so give it a try. Next step is to try to merge your IDEA branch, although I may pause to do some Installer stuff. -Alex On 6/1/15, 7:34 AM, "Frédéric THOMAS" <webdoubl...@hotmail.com> wrote: >It is not mandatory to re-apply now, I can have a look later and try to >find a way. > >Frédéric THOMAS > >> From: aha...@adobe.com >> To: dev@flex.apache.org >> Subject: Re: AW: AW: AW: [FlexJS] IntelliJ Integration >> Date: Sun, 31 May 2015 06:37:25 +0000 >> >> >> >> On 5/30/15, 8:58 AM, "Frédéric THOMAS" <webdoubl...@hotmail.com> wrote: >> >> >Ok good luck :) >> > >> >1 question though, did you plan to re-apply all the fix from the >> >sdk\modules\debugger when done ? >> >> OK, I’m out of BURM hell and now heading towards Git merge hell. >> >> I started looking into how to re-apply the fixes from >> sdk\modules\debugger. It turns out that Falcon uses a slightly >>different >> folder structure so in the flex-sdk repo, DebugCLI.java is at: >> >> modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java >> >> but in Falcon, it is in: >> >> >> debugger/src/flex/tools/debugger/cli/DebugCLI.java >> >> >> So I’m pondering how to grab all of the changes from flex-sdk (sure >>looks >> like a lot of changes) and applying them to this different folder tree >>and >> not have lots of merge issues. >> >> Thoughts? I’m done for tonight, will try again tomorrow night. >> >> -Alex >> >
