[Dctrl-tools-devel] String freeze schedule?
antti-juhani at kaijanaho.fi
Wed Dec 7 17:03:43 UTC 2011
On Wed, Dec 07, 2011 at 12:53:38PM -0400, David Prévot wrote:
> About the manpages (and their translations), is it OK to continue working on
> them on master (and I'll cherry pick the needed changes in maint-2.20), do
> you prefer me to work the other way around (work in maint-2.20 and rebase the
> changes on master later), or something else?
My normal model is to commit anything that goes to maint-2.20 to maint-2.20 and
later merge it to master. (If using a feature branch destined to maint-2.20,
I'd base it on maint-2.20, merge it there and then later merge to master.) I
would avoid rebasing anything that has been pushed to a public repo.
Cherrypicking is, however, ok.
Of course, any translator string changes (including, I think, manpage changes)
should go to master only. (But since you are the one sending the request, feel
free to violate that rule as you see fit.)
Antti-Juhani Kaijanaho, Jyväskylä, Finland
More information about the Dctrl-tools-devel