> A further note: CS repository does not presently utilize the new > SVN-native merging capability introduced with SVN 1.5. Instead, as Mike > pointed out, merging in CS presently is under control (normally) of > svnmerge.py script. The TortoiseSVN merging support is based upon SVN's > built-in merging facility, not the svnmerge.py functionality. > > -- ES
And one more note, there's a Trac wiki page about branch management: http://www.crystalspace3d.org/trac/CS/wiki/SVN%20Branch%20Management Quite important: "svnmerge.py init" must be run first before one can use svnmerge in a branch. You shall run it yourself in your branch then commit, or just ask here for someone to do it. Also if you (or anyone else ;-) feel anything is missing in this wiki page, just say so or add the information... > Mike Gist wrote: >> 2009/5/26 Seth Berrier <[email protected] >> <mailto:[email protected]>> >> >> Anyways, any advice on this or general tips on working with my SoC >> branch (i.e. should I even be worrying about this when everything >> compiles okay) would be much appreciated. >> <mailto:[email protected]> >> >> >> CS maintainers tend to use 'svnmerge.py' to handle merging, it's quite >> easy to use. >> >> http://www.orcaware.com/svn/wiki/Svnmerge.py >> Download it from this page (the exe on windows, plus you'll need a stand >> alone binary install, I use http://www.sliksvn.com/en/download). >> >> I usually keep a clean checkout for merging, so I can work in a 'dirty' >> checkout and not worry about having to merge into that. >> Plus svnmerge insists on working in a clean checkout. >> >> To get svnmerge working do this; >> >> In your clean checkout run (only do this once); >> svnmerge(.exe) init >> svn ci -F svnmerge-commit-message.txt >> >> Then to see what's available to merge do; >> svnmerge(.exe) avail -S trunk >> >> This will give you a list of all revisions you can merge into your branch. >> So if it gives you; 34567-34574,34575-34578 >> >> You'd do the following to merge to your branch; >> svnmerge(.exe) merge -S trunk -r 34567-34574,34575-34578 >> svn ci -F svnmerge-commit-message.txt >> >> I hope that helps. >> >> -- >> -Mike >> >> >> ------------------------------------------------------------------------ >> >> ------------------------------------------------------------------------------ >> Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT >> is a gathering of tech-side developers & brand creativity professionals. >> Meet >> the minds behind Google Creative Lab, Visual Complexity, Processing, & >> iPhoneDevCamp as they present alongside digital heavyweights like Barbarian >> Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com >> >> >> ------------------------------------------------------------------------ >> >> _______________________________________________ >> Crystal-main mailing list >> [email protected] >> https://lists.sourceforge.net/lists/listinfo/crystal-main >> Unsubscribe: >> mailto:[email protected]?subject=unsubscribe > > > ------------------------------------------------------------------------------ > Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT > is a gathering of tech-side developers & brand creativity professionals. Meet > the minds behind Google Creative Lab, Visual Complexity, Processing, & > iPhoneDevCamp as they present alongside digital heavyweights like Barbarian > Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com > _______________________________________________ > Crystal-main mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/crystal-main > Unsubscribe: > mailto:[email protected]?subject=unsubscribe > � > > ------------------------------------------------------------------------------ Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT is a gathering of tech-side developers & brand creativity professionals. Meet the minds behind Google Creative Lab, Visual Complexity, Processing, & iPhoneDevCamp as they present alongside digital heavyweights like Barbarian Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com _______________________________________________ Crystal-main mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/crystal-main Unsubscribe: mailto:[email protected]?subject=unsubscribe
