Hello all,

Here are the command line steps I used to merge the SQLite branch into
the trunk. Each command and response is indicated by the command line
prompt "$ ". If I truncated the response, I used "...". Comments are
indicated by " *".

Questions? I'll try to answer them.


$ svn co
https://svn.sourceforge.net/svnroot/frontierkernel/Frontier/trunk/
"Frontier_Trunk"
A Frontier_Trunk/LICENSE.txt
...
A Frontier_Trunk/build_VC6/Frontier.dsp
Checked out revision 1547.


$ cd Frontier_Trunk


$ svn log --stop-on-copy
https://svn.sourceforge.net/svnroot/frontierkernel/Frontier/branches/SQLite/
------------------------------------------------------------------------
r1547 | creecode | 2006-10-05 12:16:57 -0700 (Thu, 05 Oct 2006) | 1 line

version 10.2x isn't going to fly as we used the even subversion to
indicate stable versions. So we are left with using 10.1a11.
...
------------------------------------------------------------------------
r1233 | davidgewirtz | 2006-04-08 13:04:23 -0700 (Sat, 08 Apr 2006) |
1 line

Updated SQLite development branch after subversion conversion. -- DG
------------------------------------------------------------------------

*we're interested in the revision number of the last copy which is r1233


$ svn merge -r 1233:1547
https://svn.sourceforge.net/svnroot/frontierkernel/Frontier/branches/SQLite/
G build_CWPro8/OPML.mcp
...
G resources/OPML/OPMLdoc.icns

*in the working copy of the trunk we now have merged in the changes
from the branch


*at this point we resolve conflicts, compile, test, etc.


$ svn copy
https://svn.sourceforge.net/svnroot/frontierkernel/Frontier/trunk
https://svn.sourceforge.net/svnroot/frontierkernel/Frontier/tags/release-Frontie\
r_10.1a10
-m "Tagging the v10.1a10 release of the Frontier Kernel."


$ svn commit -m "Merged SQLite branch changes r1233:1547 into the trunk."
Sending Common/headers/kernelverbdefs.h
...
Adding build_XCode/Frontier.xcodeproj/project.pbxproj
Transmitting file data ..........
Committed revision 1549.


Toodle-looooooooooo..........
creecode