| # |
Jul 22nd 2009, 16:48 |
Phally |
seriously? |
| # |
Jul 22nd 2009, 16:48 |
alkemann |
git checkout HEAD~1 ? |
| # |
Jul 22nd 2009, 16:48 |
Phally |
thanks |
| # |
Jul 22nd 2009, 16:47 |
Phally |
ah got it |
| # |
Jul 22nd 2009, 16:43 |
alkemann |
checkout to the one before? |
| # |
Jul 22nd 2009, 16:43 |
Phally |
nvm, i'll look it up |
| # |
Jul 22nd 2009, 16:42 |
Phally |
how would i undo it? |
| # |
Jul 22nd 2009, 16:41 |
alkemann |
undo ur merge, push ur fix and ill merge it into 2.0 |
| # |
Jul 22nd 2009, 16:41 |
alkemann |
oh |
| # |
Jul 22nd 2009, 16:41 |
Phally |
that is why my logout check fails, because you had a different loginAction then i had |
| # |
Jul 22nd 2009, 16:40 |
alkemann |
knowing abuout app and requiring the app to do certain things is not the same though |
| # |
Jul 22nd 2009, 16:40 |
Phally |
yeah, it has to, else you are screwed with auth etc |
| # |
Jul 22nd 2009, 16:39 |
alkemann |
plugins usually inherit from app controller |
| # |
Jul 22nd 2009, 16:39 |
Phally |
yes, then you can merge it later on |
| # |
Jul 22nd 2009, 16:39 |
Phally |
this is going against the principle of a plugin... i mean, it shouldn't know about the App, yet it inherits from AppController |
| # |
Jul 22nd 2009, 16:38 |
alkemann |
ok.. so u have fixed it in ur branch then? |
| # |
Jul 22nd 2009, 16:37 |
Phally |
not before the merge |
| # |
Jul 22nd 2009, 16:37 |
alkemann |
u didnt have a failing test u made? |
| # |
Jul 22nd 2009, 16:37 |
Phally |
some other tests fails now in my plugin, which is really weird since it should be app independent, must be using because of the inheritance with AppController |
| # |
Jul 22nd 2009, 16:35 |
Phally |
yeah, but because of mine being old, i didn't have failing tests which you had |
| # |
Jul 22nd 2009, 16:35 |
alkemann |
i would rather i merge ur into 2.0 |
| # |
Jul 22nd 2009, 16:34 |
Phally |
should i commit after the merge? |
| # |
Jul 22nd 2009, 16:33 |
Phally |
alkemann: it is failing here too now |
| # |
Jul 22nd 2009, 16:33 |
Phally |
alkemann: oh that was easy, no conflicts, nothing, me likes |
| # |
Jul 22nd 2009, 16:31 |
Phally |
alkemann: i just switched over to yours now |
| # |
Jul 22nd 2009, 16:30 |
Phally |
alkemann: i'm going to merge them now and see some diffs |
| # |
Jul 22nd 2009, 16:30 |
alkemann |
yea on 1 |
| # |
Jul 22nd 2009, 16:30 |
alkemann |
u remove the containable? have different db config? different core version? |
| # |
Jul 22nd 2009, 16:30 |
Phally |
i don't see any queries either, you have your debug to 1? |
| # |
Jul 22nd 2009, 16:28 |
Phally |
i see no reason though, why it fails on your branch and not in mine |
| # |
Jul 22nd 2009, 16:28 |
Phally |
yeah i understand |
| # |
Jul 22nd 2009, 16:26 |
alkemann |
Phally: the point is that the users table very well may be in a different dbconfig / db in the end |
| # |
Jul 22nd 2009, 16:25 |
Phally |
ACTION votes to get rid of the prefix |
| # |
Jul 22nd 2009, 16:25 |
markstory |
weird |
| # |
Jul 22nd 2009, 16:25 |
alkemann |
it works when not usng containable though |
| # |
Jul 22nd 2009, 16:25 |
markstory |
each db config is a separate connection |
| # |
Jul 22nd 2009, 16:25 |
markstory |
so different connections |
| # |
Jul 22nd 2009, 16:25 |
alkemann |
markstory: same db. different dbconfig (prefix different) |
| # |
Jul 22nd 2009, 16:25 |
Phally |
markstory: it is the same db, just different prefixes |
| # |
Jul 22nd 2009, 16:24 |
markstory |
I thought it was separate selects. |
| # |
Jul 22nd 2009, 16:24 |
markstory |
did cross db join ever work. |