On Thu, 2007-08-16 at 11:12 -0700, Stewart Stremler wrote: > begin quoting Christian Seberino as of Thu, Aug 16, 2007 at 11:05:42AM -0700: > > > > People often shudder at thought of doing Subversion merges but > > I think I found a painfully obvious way to make merges easy.... > > > > Because Subversion makes diff'ing and copying easy: > > > > svn diff URL1 URL2 > > svn cp URL1 URL2 > > > > to do a 'merge', all you need to do is diff the trunk against you branch > > and copy files over one by one as you carefully screen the changes to the > > trunk!?! > > > > Problem solved!?!? > > Not really... it's *more* tedious and labor-intensive to do it that way. > > > No more magic and mystery! > > Just tedium. > > Get a good three-way merge program. >
Like p4merge (Perforce Merge)? I'm having to go from using Perforce to using Subversion within the next week or so. I'm not really looking forward to it, but it could be worse - I could be going all the way back to using RCS! I hate regression especially when it decreases productivity. I'm not saying Subversion is bad, but Perforce has features and capabilities that I've gotten used to that Subversion does not (like native Linux and Windows GUIs, plugins for integrating it into my favorite IDEs on both Linux and Windows, branching, labeling, jobs, tying bugs from Bugzilla to jobs to changelists, etc.). Speaking of Windows, I am once again going to be forced to do development on and for Windows, unless I can convince some people otherwise. The stuff we do is embedded, so there is no reason why we have to develop exclusively on or for Windows. I've learned that it is far better to develop platform independent utilities rather than tie yourself to one platform (which is the main reason I started developing tools in Java - I write them on my Linux box, and if someone wants to run them on Windows, then they can be my guest). PGA -- Paul G. Allen BSIT/SE Owner/Sr. Engineer Random Logic Consulting www.randomlogic.com -- [email protected] http://www.kernel-panic.org/cgi-bin/mailman/listinfo/kplug-list
