Hi, developers, I've setup svnmerge.py tool on /trunk and /branches/0.9.4 the tool tracks changes and allows listing available and merge between branches
Try to start using it for merges and you will like it, the tool simplifies the task: $ cd ~/projects/sim-im/0.9.4 $ svnmerge.py --bidirectional avail 1836-1837 $ svnmerge.py --bidirectional merge -r 1837 $ svn commit -F svnmerge-commit-message.txt read more at http://www.orcaware.com/svn/wiki/Svnmerge.py /** Description svnmerge.py is a tool for automatic branch management. It allows branch maintainers to merge changes from and to their branch very easily, and automatically records which changes were already merged. This allows displaying an always updated list of changes yet to be merged, and totally prevents merge mistakes (such as merging the same change twice). */ -- BR. Alexander 'zowers' Petrov. jabber:[EMAIL PROTECTED] icq:69694782 http://zowers.googlepages.com/ mailto:[EMAIL PROTECTED]
pgpPdur8cQfwf.pgp
Description: PGP signature
_______________________________________________ sim-im-main mailing list [email protected] https://mailman.dg.net.ua/listinfo/sim-im-main
