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

Reply via email to