Hi, This merger appeared to be relatively successful. I have noticed one problem caused by svnmerge, see below.
On Thu, Apr 3, 2008 at 8:11 PM, <[EMAIL PROTECTED]> wrote: > Author: semor > Date: Thu Apr 3 20:11:24 2008 > New Revision: 5274 > > URL: http://svn.gna.org/viewcvs/relax?rev=5274&view=rev > Log: > Merged the consistency tests branch back into the 1.3 line. > > The command used was: > svn merge -r3321:HEAD svn+ssh://[EMAIL > PROTECTED]/svn/relax/branches/consistency_tests_1.3/ . > > The code is almost ready and further changes will not affect the rest of the > code. > > > Added: > 1.3/docs/latex/consistency_tests.tex > - copied unchanged from r5273, > branches/consistency_tests_1.3/docs/latex/consistency_tests.tex > 1.3/maths_fns/consistency_tests.py > - copied unchanged from r5273, > branches/consistency_tests_1.3/maths_fns/consistency_tests.py > 1.3/prompt/consistency_tests.py > - copied unchanged from r5273, > branches/consistency_tests_1.3/prompt/consistency_tests.py > 1.3/sample_scripts/consistency_tests.py > - copied unchanged from r5273, > branches/consistency_tests_1.3/sample_scripts/consistency_tests.py > 1.3/specific_fns/consistency_tests.py > - copied unchanged from r5273, > branches/consistency_tests_1.3/specific_fns/consistency_tests.py > 1.3/test_suite/system_tests/consistency_tests.py > - copied unchanged from r5273, > branches/consistency_tests_1.3/test_suite/system_tests/consistency_tests.py > Modified: > 1.3/ (props changed) svnmerge is a bit retarted!!! This 'props changed' message means that the svnmerge properties have also been also been merged into the 1.3 line. But these properties are the revisions of the 1.3 line which have been incorported into the branch! Hmmm, slightly problematic. I'll manually delete these properties to fix the issue. But in the mean time I've found how we should properly merge these branches back into 1.3 using svnmerge itself. See the section "Merging development branches back to trunk" at http://www.orcaware.com/svn/wiki/Svnmerge.py#Development_branches. Essentially, we need to type something like: $ svnmerge.py merge --bidirectional or: $ svnmerge.py merge --bidirectional -S BRANCH_NAME Then to close this prior to deleting the branch: $ svnmerge.py uninit -S BRANCH_NAME I should get these instructions into the manual and replace the whole of the 'svn merge' sections. Regards, Edward _______________________________________________ relax (http://nmr-relax.com) This is the relax-devel mailing list [email protected] To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-devel
