Forgot your password?
typodupeerror

+ - First programming language-aware merge tool is now free for OSS->

Submitted by rocket22
rocket22 (1131179) writes "SemanticMerge merges source code files based on its structure and not the matching text blocks. This way Semantic is able to resolve conflicts involving functions that have been modified and moved concurrently, which is a frequent operation when programmers clean up code while development continues, and tends to be avoided due to the lack of proper tools.

Open beta was originally released for C# and Java support was added recently. Mac OS and Linux versions are the two top requests in the User Voice, followed by more languages such us JavaScript and C++.

The site announces it is free for developers working on Open Source projects."

Link to Original Source

+ - Method history for Subversion released->

Submitted by rocket22
rocket22 (1131179) writes "99% of the times you search through the history of a file in Subversion you're probably looking for what happened to a specific method. But, following a method is not easy since most likely it has been moved around the file, heavily refactored and modified over time. The "method history for Subversion" Visual Studio plugin tries to come up with a solution: it is able to find what happened to a given method exploring the different revisions in the history of the file and locating the given method on each of them. It is available for Visual Studio and C# and the Eclipse plugin will follow shortly."
Link to Original Source

+ - An angry user interface->

Submitted by rocket22
rocket22 (1131179) writes "Developers and designers struggle on a daily basis to come up with better user experiences. But, haven't you feel the need sometimes to be really tough with users who repeatedly make the same mistakes? At the end, it is going to be your fault, but wouldn't it be great, for a second, to have the chance to deliver a crazy GUI able to respond to the user in the way he deserves? That's what the following demo does: going wild and teaching a couple of lessons to the painful user, he won't come back again, granted... Take it as a joke, that's what it is!"
Link to Original Source

+ - GitJungle, visual evolution on git branches->

Submitted by rocket22
rocket22 (1131179) writes "Git, the distributed version control system (DVCS) created by Linus Torvals and now used by millions of developers around the world, is very strong on branching and merging which means coders end up with hundreds of branches on their repositories. GitJungle has just been launched as a free beta and comes up with an alternative way to display history compared to what GitK and GitX were able to do so far. It renders branches horizontally and explicitly draws merge arrows. It runs on Linux, Windows and MacOS X."
Link to Original Source
NASA

+ - Did NASA just discover extra terrestrial life?->

Submitted by loafula
loafula (1080631) writes "Something interesting coming down the pips from NASA it seems. On Thursday, 12/2/2010 at 2 PM the National Aeronautics and Space Administration has scheduled a press conference "to discuss an astrobiology finding that will impact the search for evidence of extraterrestrial life."
An interesting find near Saturn perhaps? "

Link to Original Source

+ - Linus on branching practices->

Submitted by rocket22
rocket22 (1131179) writes "Not long ago Linus Torvalds made some comments about issues the kernel maintainers were facing while applying the "feature branch" pattern. They are using Git (which is very strong with branching and merging) but still need to take care of the branching basics to avoid ending up with unstable branches due to unstable starting points. While most likely your team doesn't face the same issues the kernel development does, and even if you're using a different DVCS like Mercurial, is worth to take a look at the description of the problem and the clear solution to be followed in order to avoid repeating the same mistakes. The same basics can be applied to every version control system with good merge tracking, so let's avoid religious wars and focus on the technical details."
Link to Original Source

+ - Merging, a developer's nightmare?->

Submitted by rocket22
rocket22 (1131179) writes "Whether you code for a living or as a regular open source project contributor, you will find yourself making changes that collide with the ones made by other programmers. It's time to merge! It doesn't really matter whether you commit to a centralized Subversion repository or if you are using one of the modern DVCS (Git, Mercurial, Darcs), sooner or later you’ll have to run some sort of merge operation. But, is the average developer aware of the advantages brought by the newest SCMs in terms of merge tracking? What about the difference between a 2-way and a 3-way merge? This blog post explains, in a tool-agnostic way, the basics behind merging and the advantages and problems involved."
Link to Original Source

Comment: Re:Advertising disguised as history lesson. (Score 1) 244

by rocket22 (#34258536) Attached to: An Illustrated Version Control Timeline
CVS is more arcane than SVN. It locks the whole thing every time you create a branch or a tag (label). It doesn't have merge tracking, no atomic commits, no good branching... well, yes, it's an outdated beast and a nightmare to use unless the team is so lazy they prefer to stay with it.

Uncompensated overtime? Just Say No.

Working...