Hi Seth: Usually, we use svnmerge.py, as this keeps track of revisions and comments from the merged branches. I have run this from windows before, but you need python 2.5 installed, and I use msys (you can probably just use the command prompt, but I use msys for other stuff, so I use that).
The python installer takes care of the environment variables and such, so you should be able to simply run svnmerge after installing it. I believe the svnmerge script is available at: http://www.orcaware.com/svn/wiki/Svnmerge.py Try running this script instead, and see what it gives you for output. I've never gotten any tree conflicts before. Just so you know, it probably isn't necessary to merge all of the current changes to the trunk into your branch at this time. ~Scott Thus Spoke Seth Berrier: > Greetings! > > I'm needing some help working with my GSoC SVN branch. I should > preface this by saying I can checkout and compile my branch just fine > (no errors). Regardless, it seems like a good idea to merge in any > changes from the trunk before I begin (and at the very least know how > to do this should it be necessary later). > > I'm a newbie at SVN and this is a first attempt at merging two > branches. I'm using Tortoise SVN and I select Merge, I choose the > third option (merging two branches into a working copy) and give it > the trunk as the source, my SoC branch as the destination and a local > directory as the working copy. A few standard conflicts come up and I > always opt for the trunk copy but there are several 'tree conflicts' > coming up too (seem to be files that are modified in the latest trunk > version but that don't even exist in my branch). > > Problem is, with Tortoise SVN its not clear how to resolve these tree > conflicts. It doesn't just prompt you during the merge like it does > for standard conflicts and I can't figure out how to resolve it after > the fact and continue. Perhaps I need to get a local copy of these > files in my directory before I do the merge (maybe I could just browse > the CS trunk via HTTP and grab the individual files or something like > that). > > 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. > > Thanks! > Seth > > -- > [email protected] <mailto:[email protected]> > Graduate Research Assistant > University of Minnesota > Digital Technology Center > > ------------------------------------------------------------------------ > > ------------------------------------------------------------------------------ > 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
