Back-porting patches; marking the changelog message
Christian Stimming
stimming at tuhh.de
Mon Mar 21 15:47:43 EDT 2011
Am Montag, 21. März 2011 schrieb Geert Janssens:
> > you've just checked in 4 patches. How should we mark patches which
> > should be back-ported to the 2.4 branch? Should I just pick and choose?
>
> Good question.
>
> I seem to remember the devs used to prefix their commit messages with BP in
> the 2.2.x/trunk period. I found this in the wiki:
> http://wiki.gnucash.org/wiki/Development_Process#Changeset_Auditing_Process
Ok, now that the question is up: We didn't *prefix* the message, but we added
a suffix line where the text on the line was only "BP" and nothing else. If
any commit message contains this line, its email is clearly marked and
everyone knows this should be back-ported.
Also, when cherry-picking (back-porting) single patches, I would ask everyone
to add a *prefix* with the original SVN revision number (as long as we're
still on SVN). This revision number should be written in brackets, like so:
[12345] Bla Bla ... the original commit message ...
This will clearly say that this commit already exists as r12345 on another
branch, and this commit is only the back-ported version of the original one.
Thanks a lot!
Regards,
Christian
More information about the gnucash-devel
mailing list