apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Garrett Rooney" <roo...@electricjellyfish.net>
Subject Re: svn commit: r396812 - /apr/apr-util/branches/1.2.x/dbd/apr_dbd_pgsql.c
Date Tue, 25 Apr 2006 20:05:20 GMT
On 4/25/06, Bojan Smojver <bojan@rexursive.com> wrote:
> On Tue, 2006-04-25 at 07:58 -0700, Garrett Rooney wrote:
> > if you're merging a revision from trunk to a branch (or
> > vice-versa for that matter)
>
> Just occurred to me - if there is a backport from the trunk to a branch
> that isn't a straight merge (i.e. the patch needs adjusting in order to
> work), do I still comment it as "Merge revision...", or do I comment is
> as "Backport such and such fix from trunk"?
>
> I happen to have one such thing I'd like to commit (SQLite3 query BUSY
> wait fix) and I don't want to stuff up the comments on that one...

I usually note that it's a merge, and that some tweaks were needed to
make it apply to the branch.  If there are a lot of changes needed to
make it apply then obviously you'd want to go more in depth in
describing them.

-garrett

Mime
View raw message