Branches??

[Lee Willis]

Hi, 

There are a couple of changes that I committed to trunk and branches/3.8 over the last few weeks, and I was expecting those changes to be in 3.8.7.2 - but they don't seem to be. It seems 3.8.7.2 was cut from a separate branch - what's the plan for bringing everything back in sync? [And if we do this again - can we please tell people so we can get things on the right branches first time - apologies if I just missed the announcement!]

Cheers

Lee

[Zao Web Design, LLC]

Hi Lee!

Good question!  I'm sure Gary will clarify, but my understanding is that 3.8.7.2 was a bit of a zero-day scenario, so Gary just ported the security fixes (and some bug fixes, too) that seemed to be of the most importance for this release.

I could be off my rocker though :)

Thanks,

M. Justin Sainton
Zao Web Design, LLC
Principal / Project Manager
http://www.zaowebdesign.com
(c) 971.222.6330
(f) 1.413.723.0396

Lee

--
You received this message because you are subscribed to the Google Groups "WordPress e-Commerce Plugin Development" group.
To post to this group, send email to wordpress-e-c...@googlegroups.com.
To unsubscribe from this group, send email to wordpress-e-commerc...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/wordpress-e-commerce-plugin?hl=en.

[Michelle]

Hi Justin and Lee,

Justin - your right on this one, it was just the security fixes and
major melt downs. All the other changes will be included in the beta
with all the other good stuff everyone has been working on :)

[Lee Willis]

So - the security stuff will be brought back onto the 3.8 branch and normal service will be restored?

Super - was just dreading having to unwrap what patches had gone where :)

Cheers

Lee

On 22 November 2011 22:24, Michelle <mich...@instinct.co.nz> wrote:

Hi Justin and Lee,

Justin - your right on this one,  it was just the security fixes and major melt downs. All the other changes will be included in the beta with all the other good stuff everyone has been working on :)

--
You received this message because you are subscribed to the Google Groups "WordPress e-Commerce Plugin Development" group.

To post to this group, send email to wordpress-e-commerce-plugin@googlegroups.com.
To unsubscribe from this group, send email to wordpress-e-commerce-plugin+unsub...@googlegroups.com.

[Zao Web Design, LLC]

Totally - I don't believe anything was deployed on the 3.8.7.2 branch that wasn't already on the 3.8 branch.  My guess is that Gary took a copy of 3.8.7.1, ported the patches needed from the 3.8 branch, and tagged in 3.8.7.2 - no worries :)

Thanks,

M. Justin Sainton
Zao Web Design, LLC
Principal / Project Manager
http://www.zaowebdesign.com
(c) 971.222.6330
(f) 1.413.723.0396

To post to this group, send email to wordpress-e-c...@googlegroups.com.
To unsubscribe from this group, send email to wordpress-e-commerc...@googlegroups.com.

[Lee Willis]

What I'm worried about is stuff that is on the 3.8 branch, but isn't in 3.8.7.2. If we're going to pull everything on 3.8.7.2 back onto branches/3.8 and release 3.8.8 (Or whatever) from there, then that's fine - well catch up then. But if not ...

We'll wait for Gary to comment I guess :)

Cheers

Lee

[Gary Cao]

Hi Lee,

Sorry for the confusion :) Here's a break-down on things:

- 3.8 branch contains stuff for 3.8.8 (improvement on settings page, purchase log listing, variation UI etc.)

- 3.8.7 branch contains stuff for 3.8.7.x (strictly for bug fixes only, no new features)

The most recent release 3.8.7.2 is basically the security patch plus several bug fixes ported from 3.8 branch, applied upon 3.8.7 branch.

The 3.8 branch has all the commits (including the security patch) that is on 3.8.7, so there's no need to port back anything from 3.8.7 branch to 3.8.

Hopefully that clears out all confusion.

Best,

Gary.

[Lee Willis]

Brilliant - thanks Gary.

Regards

Lee

--

You received this message because you are subscribed to the Google Groups "WordPress e-Commerce Plugin Development" group.

To view this discussion on the web visit https://groups.google.com/d/msg/wordpress-e-commerce-plugin/-/7sTk6QYo4p0J.