12 messages in com.mysql.lists.community-doxygenRe: MySQL Doxygen Project - top prior...
FromSent OnAttachments
David Shrewsbury13 Dec 2006 08:54 
Lars Thalmann18 Dec 2006 09:09 
Jay Pipes18 Dec 2006 11:25 
Lenz Grimmer19 Dec 2006 05:44 
Jay Pipes19 Dec 2006 12:06 
Lenz Grimmer20 Dec 2006 04:04 
David Shrewsbury20 Dec 2006 06:04 
Timour Katchaounov20 Dec 2006 06:27 
David Shrewsbury20 Dec 2006 06:33 
Lenz Grimmer20 Dec 2006 06:36 
Konstantin Osipov05 Mar 2007 05:35 
David Shrewsbury05 Mar 2007 05:49 
Subject:Re: MySQL Doxygen Project - top priority files
From:Timour Katchaounov (tim@mysql.com)
Date:12/20/2006 06:27:39 AM
List:com.mysql.lists.community-doxygen

David,

<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.

/Timour

<skip>