Problems after using git to get develop branch of revo [SOLVED]

ok thought I’d have a look at whats happening in the development branch of revo. So followed the instructions here http://rtfm.modx.com/display/revolution20/Git+Installation Every thing seems to go fine untill I run setup. I then get the following messages.

Fatal error: Uncaught exception ’SmartyException’ with message ’Please use parent::__construct() to call parent constuctor’ in /home/cwworguk/public_html/revolution/core/model/smarty/Smarty.class.php:777 Stack trace: #0 /home/cwworguk/public_html/revolution/setup/includes/modinstallsmarty.class.php(40): Smarty->__call(’Smarty’, Array) #1 /home/cwworguk/public_html/revolution/setup/includes/modinstallsmarty.class.php(40): Smarty->Smarty() #2 /home/cwworguk/public_html/revolution/setup/includes/modinstallrequest.class.php(92): modInstallSmarty->__construct() #3 /home/cwworguk/public_html/revolution/setup/index.php(88): modInstallRequest->loadParser() #4 {main} thrown in /home/cwworguk/public_html/revolution/core/model/smarty/Smarty.class.php on line 777

This server runs the stable version downloaded from the main site np.

Server details
PHP Version 5.2.14
mysql 5.0.91-community-log
centos 4.8
Apache/2.2.16

I have tried this several incase i missed somthing the first time but always the same errors.

Update your Git develop branch.

ok running git fetch upstream gives run from inside the revolution directory

fatal: ’upstream’: unable to chdir or not a git archive
fatal: The remote end hung up unexpectedly

ok read the docs a little more and changed

git fetch upstream
git rebase upstream/develop

to

git fetch origin
git rebase origin/develop

These commands ran fine but setup still returns the same errors

No, the first one is correct. Fetching from Origin would get data from your clone, which is not up-to-date.

I’m guessing you missed on these steps:

You need to run git clone while in the directory above the modx root. Then you need to type "cd revolution" to change to the .git Revolution directory you just created before creating, fetching, or rebasing. You always need to be in that revolution directory before issuing any git commands.

No, BobRay, he probably cloned directly from the modxcms/revolution repository. origin is correct in that instance. upstream is only if you fork modxcms/revolution.

peteedley: I’ve commited a fix for the issue. Upgrade again.

Quote from: splittingred at Nov 16, 2010, 05:12 PM

No, BobRay, he probably cloned directly from the modxcms/revolution repository. origin is correct in that instance. upstream is only if you fork modxcms/revolution.

Ah ... I didn’t see that the page he linked to has both methods in the instructions. I question whether that’s a good idea. I just changed "fetch origin" to "fetch upstream" near the end, but now I’m not sure what it should be because origin will be different depending on which earlier instructions the person followed. Having some people clone the repository and others clone their forks is going to cause a world of confusion, IMO.

Still, the error message he got only happens when there is no .git directory, AFAIK, so he wasn’t in the directory he cloned when he tried to update.

@peteedley - Type:



See which remote, upstream or origin, points to github.com/modxrevolution.git (without your git username in the URL).
Fetch from that one.

There should absolutely be no discussion of forking or upstream except in contributor documentation. The update/build from Git should be for user installation only.

OK this seems to have solved it’s self over night I re-ran

git fetch origin
git rebase origin/develop

This morning it updated a few things and the setup runs fine.

Thanks for the help guys not sure what was causing the original problem but hey.

Quote from: OpenGeek at Nov 17, 2010, 12:00 AM

There should absolutely be no discussion of forking or upstream except in contributor documentation. The update/build from Git should be for user installation only.

Right, I suggested earlier that we need a separate group that just wants the current dev. version but won’t contribute -- "testers" ? They definitely need a separate page of instructions so their steps aren’t on the same page as the Contributors’ steps. I’d do it, but I don’t know how to create a new page.

Do you think they need to fetch and rebase also, or could they just pull? We don’t care about their history if they have no fork to push to.