12 messages in com.mysql.lists.community-doxygenRe: MySQL Doxygen Project - top prior...| From | Sent On | Attachments |
|---|---|---|
| David Shrewsbury | 13 Dec 2006 08:54 | |
| Lars Thalmann | 18 Dec 2006 09:09 | |
| Jay Pipes | 18 Dec 2006 11:25 | |
| Lenz Grimmer | 19 Dec 2006 05:44 | |
| Jay Pipes | 19 Dec 2006 12:06 | |
| Lenz Grimmer | 20 Dec 2006 04:04 | |
| David Shrewsbury | 20 Dec 2006 06:04 | |
| Timour Katchaounov | 20 Dec 2006 06:27 | |
| David Shrewsbury | 20 Dec 2006 06:33 | |
| Lenz Grimmer | 20 Dec 2006 06:36 | |
| Konstantin Osipov | 05 Mar 2007 05:35 | |
| David Shrewsbury | 05 Mar 2007 05:49 |
| Subject: | Re: MySQL Doxygen Project - top priority files |
|---|---|
| From: | Lenz Grimmer (le...@mysql.com) |
| Date: | 12/20/2006 06:36:25 AM |
| List: | com.mysql.lists.community-doxygen |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Hi,
On Wed, 20 Dec 2006, Timour Katchaounov wrote:
<skip>
Thanks Lenz. I pulled this down this morning. We've been working off of the 5.0.27 stable source tree, so all of the changes that we've done have been using those files. I did a:
diff --brief mysql-5.0-doxgen/sql mysql-5.0.27/sql
this morning to compare the sql/ directories in the two trees and it looks like all of the files are different between them. Will Bitkeeper handle merging our modified 5.0.27 files into this new tree ok? Or will it undo all changes committed after 5.0.27? That, obviously, would be very bad.
BitKeeper will handle most of the cases automatically. The only merge conflicts that you may have are in cases when someone changed the comments you changed. In those cases it should be easy for you to resolve the conflict.
Well, David won't be the one applying the patches (as he has no direct write access to the tree and the free BK client does not support commiting of changes anyway), that needs to be done by someone inside of MySQL. But I agree, BK is usually quite good with that.
In any case, we should try to apply the first batch of patches quickly, so the already existing modifications are incorporated and available for others via the public BK tree soon and we can continue to work from a more recent source than 5.0.27.
From this point of time on, we should try to not let the tree fall too much behind the main tree, to avoid time-consuming merge operations. This means that new additions to the Doxygen tree should be applied quickly and we should pull from the main tree frequently.
Bye, LenZ - -- Lenz Grimmer <le...@mysql.com> Community Relations Manager, EMEA MySQL GmbH, http://www.mysql.de/, Hamburg, Germany Visit the MySQL Forge at http://forge.mysql.com/ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) Comment: For info see http://quantumlab.net/pine_privacy_guard/
iD8DBQFFiUqBSVDhKrJykfIRAmDeAJwN/jJC6wuLn/gL6Xh3Tf/QoO7U1wCfbh+u nJgrzcbv+QNU08kMUzDEU9s= =hTbH -----END PGP SIGNATURE-----