Check local version against : Here
Howto : Howto
becker227: /usr/local/bin/svnmerge.py --version svnmerge r26317 modified: 2007-08-26 01:04:48 +0000 becker97: setup -l fw 1.2 214 Setup trunk Current becker98: cd $FW_DIR/ /lsst/becker/lsst_devel/DC2/fw214 becker99: cd ../ /lsst/becker/lsst_devel/DC2 becker100: svn co svn+ssh://svn.lsstcorp.org/DC2/fw/trunk fwMerge becker101: cd fwMerge/ becker102: svnmerge.py init svn+ssh://svn.lsstcorp.org/DC2/fw/tickets/214 property 'svnmerge-integrated' set on '.' becker103: more svnmerge-commit-message.txt Initialized merge tracking via "svnmerge" with revisions "1-3150" from svn+ssh://svn.lsstcorp.org/DC2/fw/tickets/214 becker104: svn ci -F svnmerge-commit-message.txt Sending . Committed revision 3385. becker105: svnmerge.py merge --bidirectional becker106: svn status ? svnmerge-commit-message.txt M . M tests/SConscript A + tests/MaskIO_2.cc M tests/Convolve_1.py A + tests/MaskedImageIO_2.cc M include/lsst/fw/Mask.cc M include/lsst/fw/Kernel/KernelFunctions.cc M include/lsst/fw/Mask.h M include/lsst/fw/MaskedImage.cc M include/lsst/fw/MaskedImage.h becker107: eups declare -r $PWD fw merge becker108: setup fw merge # make sure it builds! becker109: scons becker113: svn commit becker114: svnmerge.py uninit property 'svnmerge-integrated' deleted from '.'. property 'svnmerge-blocked' deleted from '.'. becker118: svn ci -F svnmerge-commit-message.txt Sending . Committed revision 3387.
