[Aptitude-devel] Bug#674664: OK to help handling these BR but need info on git branches

[Daniel Hartwig]

On 27 May 2012 14:49, Christian PERRIER <bubulle at debian.org> wrote:
> Hello Daniel and other aptitude devels;
>
> I'm fine with helping to deal with these localization and English
> usage bugs reports, but I need help in properly handling git commits
> to avoid screwing your workflow.
>
> When a translation is sent, shoudl I commit it to the "master" branch
> or to the debian branch?

Hi Christian

Since we are actively developing and another release is ready soon,
please send these changes directly to master.

In this case, the new Italian documentation also needs changes to
debian/control.  However, please only import the documents to master
and update the build system, I will update control after merging the
branches.

In the future if development is stopped and you like to make a "nn-2"
release or NMU, do send the updates to the debian branch instead.
They should only change files in the debian/ sub-tree, and usually be
in the form of a quilt-patch and changelog entry.  If not, this will
disrupt the release process next time, during the merge
(git-import-orig).

> I will anyway need to commit the changelog
> entry to the "debian" branch, right?
>

You can use the NEWS file on master as your changelog, and all
relevant notes will be copied to debian/changelog during the release
process.

Thanks for your continued efforts on l10n :-)