Better merge tracking coming to Subversion

Posted on

The more I use subversion, the more I find ways to make it do more heavy lifting for me. I'm not talking about the kind of subversion that gets you a one way ticket to gitmo, but the open source version control system. I use it to manage my websites here, to keep them updated with the development copies I work on at home. We've also started using it more routinely at work on client sites, since it gives us an audit trail of changes. \

One complain aginst SVN has been the lack of automated merge tracking.  Its actually tedious and manual to have to merge changes from different copies, since unlike CVS, there's no concept of a "branch" per se in SVN. Well, version 1.5 will introduce features to automate merge tracking.

Subversion's upcoming 1.5 release is scheduled to deliver the core merge tracking feature with subsequent releases likely extending this. Fundamental to all merge tracking related functionality is the functionality to automatically record what change sets have been copied, or merged, where.

Tags: Programming, Subversion

─── ✧ ─── ✦ ─── ✧ ───

The impact of SUM on MLS

Posted on

[Soccer America](http://www.socceramerica.com/index.cfm?fuseaction=Articles.showArticleHomePage&art_aid=3396 "Tapping Into a Gold Mine") looks at what impact, if any, Soccer United Marketing (S.U.M) has had on our domestic league. They're very shrewd promoters, including clauses in contracts that teams coming over to play in friendlies, like Mexico or Manchester United, have to bring their first team regulars. It sounds like the impact on MSL is fairly mixed so far, but the SuperLiga later this year will be huge. Beyond the \$1M prize for the winning team, the games will be broadcasted on Univision and Telefutura. At least, S.U.M. has managed to bring the attention of Hispanic broadcast media back to MLS, and that will help the league tap into that audience in the long run. > [ The combination of coverage on Fox Sports en Espanol (approximately > 10 million viewers and TeleFutura (46 million) gives MLS a much > greater reach into the Hispanic market through television. > Cross-promotion between the Latino and Anglo soccer communities may > boost Mexican-American attendance at MLS games.]{.articleText} HT: [Dunord](http://dunord.blogspot.com/2007/05/be-with-you-news.html)

Tags: Games, Soccer, Sports, Television

─── ✧ ─── ✦ ─── ✧ ───

Friday Flick Fun

Posted on

Sorry, I couldn't resist a little alliteration today. I've had a [flickr account](http://www.flickr.com/photos/omerida/) for a while now, and its definitely a slick site if you're looking for a good photo sharing site. If you're using Kodak's photo sharing site, switch now. I'll be honest now, if you send a link to a kodak gallery, I'll never look at it. Not just because it requires registration, but the interface is horrible and its clearly geared toward getting people to buy prints of the pictures. My flickr stream, along with some simple jquery magic, is now behind the image thumbnails on my blog's header.  To go the extra geeky mile, I have it setup so that I can send a picture from my phone to flickr, and it'll show up here. Have fun stalking me! Oh, and if you use flickr too, add me to your network and I'll do the same.

Tags: Oscarm.org, Real Life

─── ✧ ─── ✦ ─── ✧ ───