On Sunday 24 November 2013 20:24:08 Christian Stimming wrote: > Am Samstag, 23. November 2013, 10:04:51 schrieb John Ralls: > > The current guidance in the Wiki [1] (which I just copied to [2]) is > > to put the SVN revision number of the trunk commit in the > > backport's commit message. That's still legitimate guidance until > > we switch, but what should we do in the future? Short SHA1? > > > > Do we want to keep the [rev-id] Subject format or should we just say > > to use `git cherry-pick -x`, which adds the line "Backported from > > <SHA1>" to the end of the commit message? > > I think this automated annotation of the commit message by git > cherry-pick -x is just fine and we should switch to that, once we've > switched to git anyway. > > Regards, > > Christian > > > Regards, > > John Ralls
Yes, for me the cherry-pick message is ok. But this actually brings me back to the whole git backport discussion that never really got to a final answer. Depending on what branching strategy we choose, we may end up cherry picking very rarely. But I'll revive that discussion in a separate mail thread (probably not today though). Geert _______________________________________________ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
