Support adding release branch changes to master's changelog

[cookpete]

Support adding release branch changes to master's changelog

[cookpete]

@edmorley I've added my attempt at an --include-branch option to 1.6.0. Would be great to see if it's at all useful for your use case (or if it even works properly) as I don't have any decent repos to test it with.

[cookpete]

As it stands, auto-changelog will just use the currently checked out branch to generate the changelog for that branch. I suppose we could add a --branch option to specify a branch to generate a log for? Then with master checked out you could auto-changelog --branch release/v8

What is your plan when releasing v9? Merge in release/v8 and bring 8.2.1, 8.2.2, etc across to master?

[edmorley]

What is your plan when releasing v9? Merge in release/v8 and bring 8.2.1, 8.2.2, etc across to master?

Ah that's the catch, we likely won't be merging it in, since it only has cherrypicked fixed from master, and master doesn't need anything from it.

[cookpete]

So the real solution for what you need would be to include commits from a certain branch as well as the current one? Which would capture any extra releases from the included branch... although I'm not sure how well the two sets of commits would consolidate into one log? And then what happens when that branch is deleted?

[edmorley]

I think the intention at the moment is for the release/v8 branch to be long-lived. Though I can see that might not be the case for some projects.

This is turning non-trivial hehe...

[cookpete]

I have finished but not yet pushed an --include-branch option that I think solves your use case. Once the tests and stuff are sorted I'll push it up. Sorry for the delay!

[cookpete]

This is turning non-trivial hehe...

@edmorley I think you might be right. How should we order any extra releases from the included branch? In order of release date would intersperse releases from v8.x and v9.x and look a bit messy. Ordering by version number would make sense but then the releases would no longer be in date order.

[edmorley]

I think by version number makes sense?

[edmorley]

Sorry for the delayed reply -- I've finally had a chance to try this out (neutrinojs/neutrino#970), and it works great. Many thanks!