Skip to:

Opened 14 years ago

Closed 14 years ago

#2676 closed defect (bug) (fixed)

Get the trunk in sync with 1.2 branch

Reported by: boonebgorges's profile boonebgorges Owned by:
Milestone: 1.5 Priority: blocker
Severity: Version:
Component: Core Keywords:
Cc: boonebgorges@…


The merge that Andy did on Sept 6 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

Attachments (1)

redo-merge.patch (248.8 KB) - added by boonebgorges 14 years ago.

Download all attachments as: .zip

Change History (6)

#1 @DJPaul
14 years ago

Nice patch. I'm trying to work through it before my flight, so here are my thoughts so far:

-Trunk missing Not referenced because of
I suggest we add graphic back when we iterate on the wp-admin, it can stay out for merge purpose.

#2 @DJPaul
14 years ago

Still working on this. Found some more hunks which I'm checking each one and will update the patch.

#3 @boonebgorges
14 years ago

  • Cc boonebgorges@… added

#4 @DJPaul
14 years ago

The patch I am about to apply is slightly too large to attach to trac, so I'll keep it locally for a while. Note: Setup & xprofile trunk changes were not adjusted in any way, so may or may not work. Everything from branch should be in trunk -- where applicable, per Boone's notes -- and the trunk-only code should still be in.

We are going to need to test and iterate on the WP Page integration changes that Andy started; same goes for the changes to the catchuri functions, etc. We are also going to need to go through the template files and check/normalise the actions again.

#5 @djpaul
14 years ago

  • Resolution set to fixed
  • Status changed from new to closed

(In [3300]) Fixed #2676

Note: See TracTickets for help on using tickets.