On 12 Nov 07, at 3:38 AM 12 Nov 07, Mark Struberg wrote:
--- Brett Porter <[EMAIL PROTECTED]> schrieb:
Next, how can other committers get visibility into what the
contributors contributed? Much like a patch, it all gets committed
under one ID, but in that case we have the original contribution in
JIRA. Is there a way we'll be able to see what it was at some
arbitrary point in the future?
The scenario would imho look like the following:
.) contributor has a git-clone of the maven-repo
.) contributor creates a new git-branch for the feature and changes
all the things needed (same
like in a 'clean' patch) (or for small changes we only need the sha1
of the single commit)
.) contributor tells the committers what he has changed and where
they can find the repo(url +
branch or even the single sha1 commit-key).
.) the committer git-pull the feature branch into his own repo and
if it's ok he merges the
changes to the master branch.
.) committer pushes the changes to the public maven git-repo and
then exports the changes to svn
From here I pull from the repository that was worked on by the
contributor and then use git-svn to "dcommit" back to Apache. It's
essentially a series of pulls until I do the final "push" back to
Apache. This is the model for the Linux kernel though there is no
final push. Linus just pulls to his copy which is effectively the
master.
All the information from the contributor should now be available in
the main repo as well.
If you find a better way, then please let me know ;)
Finally, how do other committers go about merging a branch back
into the mainline svn repository?
I for myself only maintain a few small git-repos with up to 2
colleges and push changes back to
cvs, but i hope the svn-bridge works very similar:
The committers get a ssh access with the git-shell (
http://www.kernel.org/pub/software/scm/git/docs/git-shell.html ) and
push their changes to the
main git repo. Afterwards i call git-cvsexportcommit. The pendant
for svn is git-svn but i never
used that myself.
LieGrü,
strub
Jetzt Mails schnell in einem Vorschaufenster überfliegen. Dies
und viel mehr bietet das neue Yahoo! Mail - www.yahoo.de/mail
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Thanks,
Jason
----------------------------------------------------------
Jason van Zyl
Founder, Apache Maven
jason at sonatype dot com
----------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
