Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename commit command to branch and enhance #10346

Merged
merged 1 commit into from
Jun 20, 2019
Merged

Conversation

hmlanigan
Copy link
Member

@hmlanigan hmlanigan commented Jun 18, 2019

Description

Rename commit command to branch. Enhance renamed branch command
to display current branch if none provided.

QA steps

  1. export JUJU_DEV_FEATURE_FLAGS=generations
  2. juju bootstrap
  3. juju branch <- Active branch is "master"
  4. juju add-branch testme
  5. juju branch <- Active branch is "testme"
  6. juju branch master <- Active branch set to "master"
  7. check 'see also' of other branch related commands
  8. juju help branch

Documentation changes

This feature is still under development, however any docs referencing juju commit should be updated to use juju branch in the develop stream and enhancement noted.

@hmlanigan
Copy link
Member Author

hmlanigan commented Jun 18, 2019

Only c47eef3 needs reviewing, the other two commits are covered in PR 10345.

@hmlanigan hmlanigan force-pushed the branch branch 2 times, most recently from c47eef3 to efd81ec Compare June 19, 2019 13:22
@hmlanigan hmlanigan changed the base branch from develop to 2.6 June 19, 2019 13:40
Copy link
Member

@manadart manadart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should rename a couple more variables, but all looks good.

@hmlanigan
Copy link
Member Author

@manadart thought I caught all the changes from checkout to branch. Glad you found the ones I missed. Thank you. Caught one more too making the change.

@hmlanigan
Copy link
Member Author

$$merge$$

1 similar comment
@hmlanigan
Copy link
Member Author

$$merge$$

@jujubot jujubot merged commit 208f334 into juju:2.6 Jun 20, 2019
jujubot added a commit that referenced this pull request Jun 22, 2019
#10367

## Description of change

Merge into develop, bringing forward:
- #10366 from manadart/2.6-cache-testing-infrastructure
- #10364 from manadart/2.6-config-watch-branch-determination
- #10362 from anastasiamac/merge-25-26-2106
- #10346 from hmlanigan/branch
- #10359 from hmlanigan/createdtomodelcache
@hmlanigan hmlanigan deleted the branch branch September 5, 2019 15:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants