| # |
Jul 20th 2009, 07:50 |
alkemann |
markstory: i was wondering if u could tell me how to use schema files other than /app/config/sql/schema.php |
| # |
Jul 20th 2009, 07:35 |
markstory |
alkemann: > |
| # |
Jul 20th 2009, 06:02 |
Phally |
that goes beyond my knowledge of GIT atm :p |
| # |
Jul 20th 2009, 05:59 |
alkemann |
so if we can find a way to skip that merge thing (probably rebase it into prior commit, then we are set |
| # |
Jul 20th 2009, 05:59 |
Phally |
keeps things stuctured |
| # |
Jul 20th 2009, 05:58 |
Phally |
exactly |
| # |
Jul 20th 2009, 05:56 |
alkemann |
better to comeplete a task on the same code base yea? |
| # |
Jul 20th 2009, 05:51 |
Phally |
plus changes might be based on old code then |
| # |
Jul 20th 2009, 05:50 |
Phally |
*indeed |
| # |
Jul 20th 2009, 05:50 |
Phally |
no ideaa |
| # |
Jul 20th 2009, 05:50 |
alkemann |
if u have commited some though.. dont want the merge in the middle of ur task's commits |
| # |
Jul 20th 2009, 05:50 |
Phally |
well, you can always stash your changes |
| # |
Jul 20th 2009, 05:49 |
alkemann |
yea thats fine for now, but once more people start working on it, and there can be changes to the online version while ur mid work on a task, then it isnt the best way, imho |
| # |
Jul 20th 2009, 05:47 |
Phally |
i have to admit i work locally on the usersplugin branch, make a few commits and when i'm done, i push them |
| # |
Jul 20th 2009, 05:47 |
Phally |
ah i understand |
| # |
Jul 20th 2009, 05:46 |
alkemann |
so i can pull from thechaw repo without merging onto what im working on localaly |
| # |
Jul 20th 2009, 05:46 |
alkemann |
also i like to only commit to it when i havev completed a task, instead of having an unclean local branch copy. |
| # |
Jul 20th 2009, 05:45 |
alkemann |
i have a 2.0 branch locally as wel yes. but working on that is not the way your suppose to work afaik. u can rebse commits and put them into that etc. |
| # |
Jul 20th 2009, 05:43 |
Phally |
yeah, tests are perfect, also when fixing bugs, you don't break anything else and even when you do, you know exactly where the problem is |
| # |
Jul 20th 2009, 05:42 |
Phally |
can't you just do git checkout 2.0 and get on with that? |
| # |
Jul 20th 2009, 05:41 |
Phally |
hmm yes, i noticed that rebake, would be nice to have that gone indeed, because it won't be listed as a branch on thechaw |
| # |
Jul 20th 2009, 05:39 |
alkemann |
hopefully other developers can read these tests to see how the article and article pages should work |
| # |
Jul 20th 2009, 05:38 |
alkemann |
i really like doing my app flow design with tests .. much less work. and like phishy said, it's a great way of "saving" ur testing as you develop |
| # |
Jul 20th 2009, 05:37 |
alkemann |
currently im write tests for Article flow with draft and revision on pages |
| # |
Jul 20th 2009, 05:36 |
alkemann |
hopefully gwoo can help me get rid of them |
| # |
Jul 20th 2009, 05:36 |
alkemann |
i dont develop in the 2.0 branch. i do on a local branch i have called rebake |
| # |
Jul 20th 2009, 05:36 |
alkemann |
i dont like these though http://thechaw.com/bakery/commits/view/07677e87803dd3e50e31cdf27d80e400cabf508b |
| # |
Jul 20th 2009, 05:36 |
alkemann |
then resolve any conflict and commit |
| # |
Jul 20th 2009, 05:35 |
alkemann |
yea, but it's really as simple as checking out the merge to branch and "git merge usersplugin" |
| # |
Jul 20th 2009, 05:35 |
Phally |
alkemann: how do you merge? using the gui? |
| # |
Jul 20th 2009, 05:35 |
Phally |
alkemann: good job, i see you merged the usersplugin in too |
| # |
Jul 20th 2009, 04:59 |
nicd__ |
n |
| # |
Jul 20th 2009, 04:50 |
alkemann |
gwoo: awake? |
| # |
Jul 20th 2009, 04:50 |
alkemann |
tests for drafting of article pages |
| # |
Jul 20th 2009, 04:49 |
alkemann |
http://thechaw.com/bakery/commits/logs/07677e87803dd3e50e31cdf27d80e400cabf508b..3601fdc549e20283271ba37db83df4d4b1d99c76 |
| # |
Jul 20th 2009, 04:49 |
alkemann |
pushes |
| # |
Jul 20th 2009, 04:16 |
Phally |
http://book.cakephp.org/view/415/load |
| # |
Jul 20th 2009, 04:16 |
Phally |
not sure |
| # |
Jul 20th 2009, 04:16 |
Phally |
or in the api under configure::load() |
| # |
Jul 20th 2009, 04:15 |
Phally |
its in the book |
| # |
Jul 20th 2009, 04:12 |
xkunalx |
does cake have a concept of a config file? or just the configure class |