Try including CE as a submodule:
http://github.com/guides/using-git-submodules-to-track-plugins

That way you can just do 'git submodule update' to pull new versions of CE.

On Thu, Aug 28, 2008 at 7:32 AM, Bryan Kearney <[EMAIL PROTECTED]>wrote:

>
> That just mneans you have a larger repo.. but hey. disk space is cheap.
>
> I have always had to delete the .git directory when using CE. Has
> anoyonne gotten this to work if the containing app is also in git?
>
> -- bk
>
>
> Alejandro wrote:
> > It worked without the --depth 1!
> >
> > Thanks a lot
> >
> > On Aug 27, 9:22 am, Bryan Kearney <[EMAIL PROTECTED]> wrote:
> >> Perhaps, are there premissions issues with this? The only thing I can
> >> think of is that prehaps the newer mods were off of earlier commits and
> >> thereore the --depth 1 caused issues. I would repull without the --depth
> >> and you should be fine.
> >>
> >> -- bk
> >>
> >> Alejandro wrote:
> >>> Sorry about asking this here, but I'm new to git (I always use CVS and
> >>> SVN) and I want to checkout a version of CE and keep it up to date.
> >>> I did a git clone --depth 1 git://github.com/bborn/communityengine.git
> >>> vendor/plugins/community_engine
> >>> and then I tried to update it using git pull and I get this:
> >>> .
> >>> .
> >>> test/unit/offering_test.rb: needs update
> >>> test/unit/photo_test.rb: needs update
> >>> test/unit/poll_test.rb: needs update
> >>> test/unit/post_test.rb: needs update
> >>> test/unit/sb_post_test.rb: needs update
> >>> test/unit/skill_test.rb: needs update
> >>> test/unit/state_test.rb: needs update
> >>> test/unit/topic_test.rb: needs update
> >>> test/unit/user_notifier_test.rb: needs update
> >>> test/unit/user_test.rb: needs update
> >>> test/unit/vote_test.rb: needs update
> >>> uninstall.rb: needs update
> >>> error: Entry 'app/controllers/admin_controller.rb' not uptodate.
> >>> Cannot merge.
> >>> Any clues?
> >>> Thanks
> > >
> >
>
> >
>

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"CommunityEngine" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/communityengine?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to