On Fri, Feb 29, 2008 at 7:27 AM, Adam Monsen <[EMAIL PROTECTED]> wrote: > On Fri, Feb 29, 2008 at 2:42 AM, Massimiliano Parlione > <[EMAIL PROTECTED]> wrote: > > It is fine for us. Just a curiosity, how do you automate the merge? > > We'll use the "svnmerge" tool. Please read this quick tutorial: > > http://www.orcaware.com/svn/wiki/Svnmerge.py#Development_branches
Forgot to mention a couple of things. The branch svn URL is: https://mifos.dev.java.net/svn/mifos/branches/hibernateUpgrade You should check out from that URL exactly, not from a subdirectory (like "mifos"). When you create the project in Eclipse (or whatever), you will use the "mifos" subdirectory. Just ignore the other subdirectories ("www", "mifosSoap"). The following should be performed from the root directory of your "hibernateUpgrade" working copy to pull in changes from the trunk: $ svnmerge.py merge ...at this point you have a chance to resolve merge conflicts, if any. Once this is complete... $ svn ci -F svnmerge-commit-message.txt $ rm svnmerge-commit-message.txt Please do the merge *at least* once a week. The more often the better so you keep abreast of trunk changes. Let me know if you have any questions. IRC/dev mailing list/skype/email whatever! The branch/merge process is [somewhat poorly] documented here: http://mifos.org/developers/wiki/BranchingStrategy -- Adam Monsen ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
