db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Andrew McIntyre" <mcintyr...@gmail.com>
Subject Re: How does a contributor who is not a committer merge a change?
Date Fri, 30 Jun 2006 18:45:44 GMT
On 6/30/06, David Van Couvering <David.Vancouvering@sun.com> wrote:
> http://wiki.apache.org/db-derby/MoveAChangeBetweenBranches
>
> is very helpful, but is focused on the steps a committer would take.
>
> Is there a process for a contributor who is not a committer to merge a
> change and then submit a patch for the merge?  Or is this something that
> can only be done by a committer?

A contributor could try an svn merge for themselves and see if it
merges successfully and run tests, etc. If all is well, they could
comment on the JIRA that a simple svn merge works. This is good for
the committer looking to perform the actual merge, since they know the
merge works and test have already been run, etc.

If there are conflicts in the merge, a contributor could resolve the
conflicts in their own subversion view, run tests, and post a patch
for a committer to review. The committer can then pick up the patch,
review the differences between the original and merged versions, and
commit if all is well.

Either way, the contributor has taken much of the burden off the
committer by performing some of the steps necessary to commit the
merge. Deepa took both of these approaches for some of the merges that
went into 10.1.3 and it was very helpful. (Thanks, Deepa!)

andrew

Mime
View raw message