proposal to merge cat2hel branch back into trunk
Gabriel Farrell
needed to be done in the cat2hel branch to move the "catalog" Django
project to "helios" and remove the extra settings.py in the "catalog"
application, addressing issue 17.
I also commented out the cache directives in the remaining settings.py
file, effectively removing the cache setup requirement, re: issue 19.
I can continue working in the cat2hel branch (on issue 18), but I feel
this stuff could be beneficially merged back into trunk. I haven't
done a hell of a lot of testing, but I don't see these changes
breaking much unless people have specific setup needs that are served
in some way by the current trunk.
So the short question: could everyone working on or using trunk take a
few seconds to check out branches/cat2hel-gsf and post here if there
are any problems?
Thx,
gsf
D Chudnov
>
> So the short question: could everyone working on or using trunk take a
> few seconds to check out branches/cat2hel-gsf and post here if there
> are any problems?
I'll take a look as soon as I can (tonight or tomorrow night). The
goal here is to merge the updates on your branch right back into the
trunk, right?
In general, since there are so few of us working on this (unless I'm
misunderstanding who's involved) I'm all for merging the branch work
back into trunk asap, and keeping a single line of development for as
long as possible.
-Dan
Gabriel Farrell
On Nov 26, 4:55 pm, "D Chudnov" <daniel.chud...@gmail.com> wrote:
>
> In general, since there are so few of us working on this (unless I'm
> misunderstanding who's involved) I'm all for merging the branch work
> back into trunk asap, and keeping a single line of development for as
> long as possible.
>
> -Dan
thought they'd be, so I'd like to bring them back into the trunk and
continue working on things there.
Dan Scott
Hey Gabe:
The changes look quite straightforward to me and really quite minimal
- nice work. From my perspective, you should just merge and forge
ahead with your work on trunk (although I believe dchud still plans on
taking a look at the diffs as one more point of sanity).
--
Dan Scott
Laurentian University
Dan Chudnov
> On 26/11/2007, Gabriel Farrell <gsf...@gmail.com> wrote:
>>
>> Agreed. The changes I made in the branch aren't as extensive as I
>> thought they'd be, so I'd like to bring them back into the trunk and
>> continue working on things there.
>
> - nice work. From my perspective, you should just merge and forge
> ahead with your work on trunk (although I believe dchud still plans on
> taking a look at the diffs as one more point of sanity).
Agreed with Dan - simply running the branch's helios app, everything
Just Works. I'm not looking too closely at the code diffs, since I
don't know much about what was already there. But it does look
simpler, which is great.
Ditto what Dan S. said: merge and forge, and thanks!
-Dan C.
Gabriel Farrell
>
> Ditto what Dan S. said: merge and forge, and thanks!
>
gsf