Clarify which branches are used for what

[hansfn]

Hi,

earlier there was some information about which branches was for which version of Drupal. "master" for Drupal 8 and, 8.x-6.x for Drupal 6 and 7. Now I can't find that page/information. Have I become blind?

Another issue: Branch names. You just released 6.0.0 from the 8.x-6.x branch or? Are you planning to remove the "Drupal version" prefix for the branches to make it less confusing or do you need to keep it because of history? At least the 7 branch could be called 7.x instead of 8.x-7.x (or 9.x-7.x). I guess you have some plans related to this already - sorry to bother you ;-)

[greg-1-anderson]

We are discussing the new branch and tag names here: #16

Drush 7 is being developed in the "master" branch. I'll keep this open for documentation once the above lands.

[weitzman]

We are operating as per CONTRIBUTING.md. We will update that file based on the issue #16.

[hansfn]

Thx for pointing to #16 that I missed. Apparently I am really blind. The covers my extra issue above. However, I have read CONTRIBUTING.md and #16 and neither answers the main issue I raised: Which branches are used for what? In CONTRIBUTING.md you say that all the latest changes goes to the master branch, but you don't say if the master branch is for Drupal 8 only? Should I follow the release branch for Drupal 6/7? I'm not trying to be pedantic ;-)

[weitzman]

Right. Where would you expect to see Drupal compatibility information? My
inclination is list the supported version info in README.md in each branch.

On Thu, Aug 22, 2013 at 2:28 AM, Hans Fredrik Nordhaug <
[email protected]> wrote:

Thx for pointing to #16 https://github.com/drush-ops/drush/issues/16that I missed. Apparently I am really blind. The covers my extra issue
above. However, I have read CONTRIBUTING.md and #16https://github.com/drush-ops/drush/issues/16and neither answers the main issue I raised: Which branches are used for
what? In CONTRIBUTING.md you say that all the latest changes goes to the
master branch, but you don't say if the master branch is for Drupal 8 only?
Should I follow the release branch for Drupal 6/7? I'm not trying to be
pedantic ;-)

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/27#issuecomment-23070954
.

[greg-1-anderson]

We get asked this a lot. Once #16 is done, I will add a chart to README.md that shows the compatibility for the current branch, and which branch to go to if you want to use Drush with some other version of Drupal.

[greg-1-anderson]

Here is an example.

Drush Version	Branch	D5	D6	D7	D8
Drush 7	master	-	OK	OK	OK
Drush 6	6.x	-	OK	OK	-
Drush 5	5.x	-	OK	OK	-
Drush 4	4.x	OK	OK	OK	-
Drush 3	3.x	OK	OK	-	-

Hm, I was hoping that I could add a background hilight on some of the rows, to shade the "Drush 6" line on the 6.x branch, and so on, but Markdown doesn't seem to support any form of background coloration. Drat. Maybe this is good enough as it is?

[weitzman]

I think the the final four columns can be combined into one. The values would be a comma delimited list. See below:

Drush Version	Branch	Compatible Drupal versions
Drush 7	master	D6, D7, D8
Drush 6	6.x	D6, D7
Drush 5	5.x	D6, D7
Drush 4	4.x	D5, D6, D7
Drush 3	3.x	D5, D6

[weitzman]

I'm OK with Greg's table as well. I think what bugged me about it were the column headers, d5, d6, etc. They would be clearer with the word Drupal there but it gets verbose

[hansfn]

Both tables look OK to me. Having that in the README would be a great improvement, but one piece of information is still missing - which is the recommended branch.

Let's say I run D7 (and I use Git to fetch the latest changes to Drush). Which is the recommended branch to follow? I understand that in some cases this isn't a clear cut, but if it is, I think you should put it in the table.

[greg-1-anderson]

Good idea. To answer your question, the recommended branch is 6.x (currently named 8.x-6.x), unless you need D8 support, in which case you should follow Drush 7 (master).

[greg-1-anderson]

I made a nice table that integrated the Drush Versions / Supported Drupal table with the existing Code Status section of the README.md file, and committed it to master, 6.x and 5.x. I'll rename the branches in these tables after #16 lands.