You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by "Robert S. Sfeir" <ro...@codepuccino.com> on 2003/11/24 13:24:00 UTC
Patch merging process
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hey y'all. Good to see some changes to JDO 1.01. I still don't see where the 1.0 download is... well I see it, there's just nothing there.
Also for the patches I submit, how do I know when they've been checked in?
I've been trying to figure out how to maintain the changes I make, plus the changes being made,
~ without losing the changes I made, and keep on going with changes I want to submit.
Am I making any sense?
Right now I've got a bunch of files modified, and I don't see my matches in, so I can't do a clean update so I can keep going with fixes.
Any suggestions on how to handle this would be great. I don't want to stop looking and making changes
while I wait for my next set of patches to be merged, that would be terribly unproductive since I can churn out lots of changes
every night, mostly cleanup duty changes.
Boy it sure is complicated not being a submitter. :-)
R
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQE/wfhg+cV9vuB27SARAnCaAJ9ziGJ36vetNAx4hA1GaViWPe2hqwCggmWe
bRIX+T7jId2bnG2Muyvfqa8=
=wCfF
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org
Re: Patch merging process
Posted by David Warnock <da...@sundayta.com>.
Robert,
> Also for the patches I submit, how do I know when they've been checked in?
All commits are emailed automatically to this list, look for message
subjects starting with "cvs commit"
Most likely a committer will put a message on the list if they accept
your patch so that 2 people don't start applying it.
> I've been trying to figure out how to maintain the changes I make, plus
> the changes being made,
> ~ without losing the changes I made, and keep on going with changes I
> want to submit.
> Am I making any sense?
>
> Right now I've got a bunch of files modified, and I don't see my matches
> in, so I can't do a clean update so I can keep going with fixes.
if you do a
cvs -q update
then your changes will not be lost, all the files you have changed will
show up as M (modified), when a patch is applied cvs will work out that
your changes are now in the master copy and the M flag will disappear.
All you need to know is which files marked M you have sent in patches for.
Note that many of the committers are in Europe and tend to do OJB stuff
during the day, mon to fri.
You might also try sending the patches as an email attachment rather
than on your website (although also maintaining a complete set of
patches not yet applied on your website might be useful to the committers).
Yes this will feel clumsy for a while, once you get started with
committers I think you will find it quite OK, it always takes a while to
get going initially though. Also when your patch message attracts a
discussion then I find that the original purpose of the message gets
easily lost. So I would then start a new thread with the patch attached
again (revised to take into account any changes from the thread).
Regards
Dave
--
David Warnock, Sundayta Ltd. http://www.sundayta.com
iDocSys for Document Management. VisibleResults for Fundraising.
Development and Hosting of Web Applications and Sites.
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org