![]() Sure, some of the advanced diffing/merging tools like BeyondCompare, P4Merge, and Kdiff3 do a good job of this visualization, but it takes some effort to hook them into a source-control tool-chain, when the built-in merge technology should be as smart, but without having to prompt as much for human arbitration when there are conflicts. Add one element in a list, is a new line and a changed line (the comma). Diffs can be too noisy because the tools can’t give a break to specific languages. This is alluding to a level 6 on the SCMM. Things I’d like to see in the next generation of source-control tools Semantic diff/merge. Level -1 was reserved for tool that’s so bad that using nothing at all was preferable. All history locally available, cheap local branching, merge-through-rename is smooth.Faster again, merge-point-tracking better, merge-through-rename rudimentary. ![]() Faster still + atomic commits, branching capabilities are decent, with merge-point-tracking.Faster without atom commits, multi-user mode bearable.Systems that remotely hold revisions safely, but really work best if they that remote server isn’t too far away, and staff don’t step on each other’s toes too much in terms of the same source files, while mostly avoiding branching because it is expensive, and everything is slow.Summarizing the previously defined levels: It talks of where I’d like source-control to go, and reevaluates the article Lucas and I previously wrote. It was inspired by the Capability Maturity Model of course. I had been thinking of it for a many years (particularly the PVC Dimensions being level -1) and Lucas was a great collaborator to publish it, and crystalize the ideas. Lucas Ward and I published a Source Control Maturity Model (SCMM) article nearly three years ago.
0 Comments
Leave a Reply. |