The commands used were:
svn merge -r15014:15015 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15019:15020 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15020:15021 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15021:15022 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15022:15023 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15023:15024 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
This manual merger is required because the switch from the 1.3 line to the trunk (at r16829 and
r16830) has resulted in the svnmerge.py script being unusable. Therefore a manual and painful merge
procedure is required. Each branch revision which is not part of an svnmerge.py commit will be
manually ported, one by one. Many conflicts had to be resolved for this commit.
