spree-contrib / spree_digital

A Spree extension to enable downloadable products
http://spreecommerce.org
MIT License
117 stars 97 forks source link

Set up 1-3-stable and 2-0-stable branches #40

Closed petergoldstein closed 11 years ago

petergoldstein commented 11 years ago

In standard Spree extension fashion, there should be a 1-3-stable branch (current master), a 2-0-stable branch (which supports the 2.0.x Spree), and master should be updated to use 2.1.0.beta.

petergoldstein commented 11 years ago

@jdutil I'm blocked here by my limited understanding of the Versionfile. The core Spree doc appears to have gone missing, and I'm unclear what's supposed to go in each line. I would've imagined each version would point at its corresponding stable branch, but that doesn't appear to be the case. Do you have insight here?

Once I've got clarity on what the Versionfile should look like we can branch the 2-0-stable.

JDutil commented 11 years ago

According to versionfile:

"1.3.x" => { :ref => "7dabf1a5203eb42c43b573fe5576aa0adc1a9822" } "2.0.x" => { :branch => "master" }

This means git commit 7dabf1a5203eb42c43b573fe5576aa0adc1a9822 is what you should be on when you create 1-3-stable branch. When a ref is designated that essentially means it was the last commit sha before a backwards compatibility breaking change.

To get back to that commit you can do git reset: git reset 7dabf1a5203eb42c43b573fe5576aa0adc1a9822 --hard

Branch 2-0-stable can be made from HEAD on master

petergoldstein commented 11 years ago

@jdutil Ok, thanks for clarifying.

So these refer to refs in the current repo. I've already created 1-3-stable from a slightly later ref (after the .travis.yml was added), so I assume I just need to update the ref in the version file.

I can also presumably leave 2-0-stable as master for the moment, until someone submits 2.1.x changes that are not backwards compatible.

JDutil commented 11 years ago

Yea well you can update the versionfile to point to branch 1-3-stable now that one has been created. 2.0.x can stay master until time for 2.1.x changes to be merged to master.

petergoldstein commented 11 years ago

These branches have been created.