Not sure what I did wrong. Anyway, I merged your "actual fix" into the release branch. I hope I did that right.
-Alex On 7/17/13 1:06 PM, "Alex Harui" <aha...@adobe.com> wrote: >Hmm. Maybe something went wrong. I checkout the release branch, made >some changes, then did git pull --rebase on the release branch to sync up. > It picked up this one change, but not the other? > >Strange stuff... > >-Alex > >On 7/17/13 12:31 PM, "Erik de Bruin" <e...@ixsoftware.nl> wrote: > >>Ah, you're merging into the release branch? Don't forget to include the >>actual fix ;-) >> >>EdB >> >> >> >>On Wednesday, July 17, 2013, Erik de Bruin wrote: >> >>> ??? >>> >>> This is an old commit of mine, which has a bug in it (missing $), that >>>I >>> fixed in a subsequent commit... >>> >>> EdB >>> >>> >>> >>> On Wednesday, July 17, 2013, wrote: >>> >>>> Updated Branches: >>>> refs/heads/release4.10.0 5ddc3f78c -> 11d252a1b >>>> >>>> >>>> Fixed boolean conditional (hopefully, most of my shell scripting is >>>>just >>>> guesswork ;-)) >>>> >>>> Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> >>>> >>>> >>>> Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo >>>> Commit: >>>>http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b49b3e6e >>>> Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b49b3e6e >>>> Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b49b3e6e >>>> >>>> Branch: refs/heads/release4.10.0 >>>> Commit: b49b3e6ef4c70184fb63964a582bc6eb1c819557 >>>> Parents: 5ddc3f7 >>>> Author: Erik de Bruin <e...@ixsoftware.nl> >>>> Authored: Tue Jul 16 19:51:41 2013 +0200 >>>> Committer: Alex Harui <aha...@apache.org> >>>> Committed: Wed Jul 17 10:58:35 2013 -0700 >>>> >>>> ---------------------------------------------------------------------- >>>> mustella/jenkins.sh | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> ---------------------------------------------------------------------- >>>> >>>> >>>> >>>> >>>>http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b49b3e6e/mustella/ >>>>j >>>>enkins.sh >>>> ---------------------------------------------------------------------- >>>> diff --git a/mustella/jenkins.sh b/mustella/jenkins.sh >>>> index e94e88d..744a436 100755 >>>> --- a/mustella/jenkins.sh >>>> +++ b/mustella/jenkins.sh >>>> @@ -208,7 +208,7 @@ END >>>> >>>> >>>> >>>> -if [ ! SUCCESS ] >>>> +if ! SUCCESS >>>> then >>>> exit 1 >>>> fi >>>> >>>> >>> >>> -- >>> Ix Multimedia Software >>> >>> Jan Luykenstraat 27 >>> 3521 VB Utrecht >>> >>> T. 06-51952295 >>> I. www.ixsoftware.nl >>> >> >> >>-- >>Ix Multimedia Software >> >>Jan Luykenstraat 27 >>3521 VB Utrecht >> >>T. 06-51952295 >>I. www.ixsoftware.nl >
