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

Mechanism for releasing from multiple branches #38

Closed
eitanme opened this issue Oct 10, 2012 · 3 comments
Closed

Mechanism for releasing from multiple branches #38

eitanme opened this issue Oct 10, 2012 · 3 comments

Comments

@eitanme
Copy link

eitanme commented Oct 10, 2012

I couldn't find any documentation on the way that you're supposed to use bloom with multiple development branches for a stack.

For example, say I have a stack with branches fuerte-devel and groovy-devel. I'm working on groovy-devel and cherry-pick a change back to fuerte-devel. I want to release a patch release off of fuerte-devel, say 0.1.2, and a minor release off of groovy-devel, say 0.2.0.

Where should I go to find documentation on what to do?

Trying to just change bloom.conf to have a different upstream results in a lot of warnings about version numbers being lower than those that have already been released for me. Led me to be confused as to if that's the right thing to do.

@wjwwood
Copy link
Contributor

wjwwood commented Oct 10, 2012

So, you basically just get tell 'git bloom-import-upstream' to look on the fuerte-devel branch when importing and pass fuerte to git bloom-release rather than groovy and that's it.

I just finished some preliminary documentation for this: https://github.com/ros/bloom/blob/master/doc/index.rst#releasing-for-fuerte

I think that should work for now, I hope to have 0.2 of bloom out by the end of the week which will be the final version for groovy (hopefully).

Let me know if you run into other problems.

@wjwwood wjwwood closed this as completed Oct 10, 2012
@eitanme
Copy link
Author

eitanme commented Oct 10, 2012

Pretty sure that my change to bloom.conf would have the same effect as the "--upstream-devel" option, but I'll do another patch release (into both groovy and fuerte) later today and report on any funkiness I encounter.

@wjwwood
Copy link
Contributor

wjwwood commented Oct 10, 2012

It does, the '--upstream-devel' option is just a one time override, useful because most of the time you release from groovy-devel but infrequently you want to release from fuerte-devel.

There will be a warning that the version you are importing is older than the previously imported version, but you can just ignore that, it is just something to prevent accidental release of the wrong version.

Definitely let me know if you have any trouble.

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

No branches or pull requests

2 participants