[buddypress-trac] [BuddyPress] #2676: Get the trunk in sync with 1.2 branch

[buddypress-trac at lists.automattic.com]

#2676: Get the trunk in sync with 1.2 branch
--------------------------+-------------------------------------------------
 Reporter:  boonebgorges  |       Owner:     
     Type:  defect        |      Status:  new
 Priority:  blocker       |   Milestone:  1.3
Component:  Core          |    Keywords:     
--------------------------+-------------------------------------------------
 The merge that Andy did on Sept 6
 http://trac.buddypress.org/changeset/3232/ missed a lot of the patches
 that had gone into the 1.2 branch before the two had diverged.

 I just took a few hours to try to improve the situation. Here's what I
 did:
 - Ran a diff of the 1.2 branch between revisions [3032] and [3232],
 roughly the period of time when the two branches diverged.
 - Applied that diff to the trunk
 - About 80% of the diff hunks were applied successfully. Most of that
 probably consists of Andy's merge.
 - I combed through all the places where the patch couldn't be applied
 (maybe in 30 files or so) and decided on a hunk-by-hunk basis whether the
 hunk should be applied to the trunk. In some cases, for instance, the 1.2
 diff applied to something that had been deprecated in the trunk, so it
 makes sense not to apply it.

 If you've got some time, please apply the attached patch to your local
 trunk installation and poke around. On my install it seems to be running
 OK, or at least as well as the trunk was working before (which is not
 really that well).

 Thanks all

-- 
Ticket URL: <http://trac.buddypress.org/ticket/2676>
BuddyPress <http://buddypress.org/>
BuddyPress