projectwonder/wonder — pull request #243 by kierankelleher (2012-07-18 15:31:16+00:00)
Title: Rc wonder 5.7.0

Introduction
--------------

integration and master had diverged since 1c15dd97e6 (Feb 29 2012).

The original plan with integration was that commits that survived for at least a month in integration without
breakage or bugs would be deemed worthy of merging to master.

Meanwhile, we began a habit of cherry-picking from integration, somtimes making slight modifications to cherry-picked
commits and making it very difficult as time went by to reconcile what was really in one month old integration that was not in master, even with git commands that are designed to figure this out.

Solution
---------

In any case, I have attempted to merge integration from a month ago to current master, choosing commit 6154e359 on integration as a logical month-old merge point. This release candidate branch represents that merge.

I would really like anyone who works with source to checkout this branch and work with it this week, run any tests (selenium, functional, JUnit or otherwise) on your projects to make sure we have no bugs introduced by this merge.

Test and commit release candidate bug fixes (only) to this branch.

This release candidate will be merge to master 2 weeks after last bug fixes, currently projected to merge to master on August 1st 2012 at the earliest.

Prevention
-----------

* log can be used to pick a month old (or older) merge commit on integration.
* merge-base can be used to find the current common ancestor of integration and master
* please avoid cherry-picking stuff into master. All commits (except important hotfix/bug-fix for example) should incubate in integration and afterwards in a release candidate branch before going into master.

Merge Details
---------------

FYI, a few merge strategies and options were tried, all of which resulted in
130+ conflicts. The final merge command (resulting in just 9 conflicts) was:

git merge -s recursive -Xpatience -Xtheirs -Xignore-all-space 6154e35930182cabcb4263e92f47de27c6c4fefe

Conflicts:
.cvsignore
Examples/Ajax/JqueryMobileExample/.gitignore
Examples/Ajax/MooToolsExample/build.xml
Examples/Misc/ERPDFExamples/.gitignore
Frameworks/Ajax/Ajax/Support/yuicompressor-2.4.2.jar
Frameworks/Ajax/Ajax/Support/yuicompressor-2.4.6.jar
Frameworks/Ajax/Ajax/Support/yuicompressor-2.4.7.jar
Frameworks/Ajax/MooTools/.gitignore
Frameworks/Ajax/MooTools/build.xml

In addition to conflicts, the following files needed corrections after the merge to fix compilation errors. Issues
were mostly missing imports and duplicate identical methods:
Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxDatePicker.java
Frameworks/Core/ERExtensions/Sources/er/extensions/ERXExtensions.java
Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXStringUtilities.java
Frameworks/Core/ERExtensions/Sources/er/extensions/jdbc/ERXSQLHelper.java