Ok, thank jebus it wasn't me. I'm only passable at complex merges in GIT and there was a distinct possibility I did screw up the repo ;)
-Nick On Tue, Jun 2, 2015 at 3:49 AM, Christofer Dutz <christofer.d...@c-ware.de> wrote: > Ok ... now this is strange. > > I didn't pull the changes, I just fetched them as I wanted to have my > version unchanged and had a look at the changes with sourcetree. There it > looked as if origin/develop was changed to the old content (eg. Fremarker > was taken out and replaced with Velocity) ... after actually doing a pull I > saw only 4 files changed, none of them in the sdk-converter. Re-Checking > the merge, Sourcetree now displayed the inverted view "-" in front of > Velocity and "+" in front of Freemarker. > > So nothing is broken ... but I will investigate this display issue with > sourcetree ... very disturbing :-( > > Chris > > ________________________________________ > Von: Nicholas Kwiatkowski <nicho...@spoon.as> > Gesendet: Montag, 1. Juni 2015 15:56 > An: dev@flex.apache.org > Betreff: Re: What's going on in flex-utilities? > > I'm hoping I didn't screw up your changes to the mavenizer when I merged my > changes back from my trunk. What I attempted to do was merge changes that > were made in development over the last few weeks into my branch and then > merge my branch back. Is that not what happened? > > The only thing that should have updated in that merge after everything was > said and done was in the /installer/ directory. > > -Nick > > On Mon, Jun 1, 2015 at 8:38 AM, Christofer Dutz <christofer.d...@c-ware.de > > > wrote: > > > Hi, > > > > > > I just noticed a bunch of commits to the flex-utilities and especially > the > > mavenizer code. Having a look I would like to ask what's going on there? > > > > > > While some of the changes don't seem that dangerous, the switch from > > Freemarker back to Velocity as template engine could break the maven > > extension. I was stuck for several days finding out a combination of > > compatible libs that enabled me to use the mavenizer as a maven extension > > as well as a command line tool without insanely complex class loading > > issues. While I could resolve most, I couldn't get Velocity working, so I > > switched to Freemarker to avoid the problems. > > > > > > Having a look at that last commit to the flex-utilities repo it seems as > > if "quetwo" didn't update his branch for quite some time and forced in > all > > of his changes. Could you guys please have a look if anything else is > > broken? > > > > > > @quetwo ... could you please explain what and why you did these major > > changes to the mavenizer? > > > > > > Chris > > >
