Can't run build for 2.1 (rc4)

I’m trying to update an older Revolution site. Strangely, I could do a fast-forward merge on the Master branch, but not on the Develop branch.

I did get a successful merge on both branches with no conflicts, but when I try to run build.transport.php, I get this:



(I did clear the core/cache directory.)

It’s a localhost install.

Is this the first build you have run with 2.1? I’m not sure what the issue could be, but beware if you are updating from 2.0.8 to 2.1.x as there are some non-trivial merges involved. Might be best to re-check out the branch you want to use rather than doing non-ff merges; if I am understanding what you are doing...

Quote from: OpenGeek at May 12, 2011, 04:52 PM

Is this the first build you have run with 2.1? I’m not sure what the issue could be, but beware if you are updating from 2.0.8 to 2.1.x as there are some non-trivial merges involved. Might be best to re-check out the branch you want to use rather than doing non-ff merges; if I am understanding what you are doing...

It is for that install (and I think the previous version was 2.08 or slightly older). I did a non-ff merge and it was successful with no conflicts. Is there a way I can re-check out the branch without losing my own files in that install?

Quote from: BobRay at May 13, 2011, 06:37 AM

Quote from: OpenGeek at May 12, 2011, 04:52 PM

Is this the first build you have run with 2.1? I’m not sure what the issue could be, but beware if you are updating from 2.0.8 to 2.1.x as there are some non-trivial merges involved. Might be best to re-check out the branch you want to use rather than doing non-ff merges; if I am understanding what you are doing...

It is for that install (and I think the previous version was 2.08 or slightly older). I did a non-ff merge and it was successful with no conflicts. Is there a way I can re-check out the branch without losing my own files in that install?

Recheck out the branch and merge it into your repository or branch or whatever this site is? I’m not sure the issue, but if you did a non-ff merge, it’s very hard to know.