I think we are referring to BRANCHING and MERGING, not diff and merging of singular files...
On Jan 10, 2011, at 3:32 PM, Steve M wrote: > I agree that diff/merge was certainly an omission. It was almost a > deal-breaker for me to buy Versions. Sofa has taken care of that now, > but they did that by adding another product (Kaleidoscope). I don't > want to have to buy another product to get a feature that should be > built into this one. > > Anyway, I use TextWrangler for diff/merge and I'm quite happy with > it. Anyone who is struggling with this feature should download and > install TextWrangler. It integrates really nicely with Versions and > it gets the job done. Apple's FileMerge is part of the Dev Tools (I > believe?) so that works fine for Objective-C developers, but web > developers running on a Mac may not decide to go that route. > > > > On Jan 5, 3:27 pm, Daniel Dickison <[email protected]> wrote: >> I agree -- it was useful to see that Cornerstone had gotten a merge >> feature. Competition is good and I hope it pressures Sofa to up the >> ante. >> >> On the other hand, I tried the new Cornerstone and fortunately (for >> Sofa), I'll be sticking with Versions for now. We have repositories >> with hundreds of thousands of files and revisions, and Cornerstone's >> fancy timeline view doesn't seem to scale very well for large >> histories. Things like viewing the log message and diffs for a >> specific revision from 2 years ago is a lot easier to navigate with >> Versions. And to do that Versions was using 400MB RAM vs 1.5GB for >> Cornerstone. So, hopefully performance is one aspect Versions can >> stay on top while adding new features. >> >> Daniel >> >> On Jan 3, 3:42 pm, ct-scan <[email protected]> wrote: >> >> >> >> >> >> >> >>> I'm glad the link to Cornerstone was posted, I've been using Versions >>> since the beta, and am getting frustrated that this obvious feature >>> still isn't integrated. >> >>> Maybe instead of additional UI enhancements (like the ones that just >>> came out), adding this much requested feature would be better. >>> I'd even upgrade to a new version for this feature, with no >>> hesitation. I love Versions, but it's just not the most complete tool >>> out there. >>> I hope they fix this. > > -- > You received this message because you are subscribed to the Google Groups > "Versions" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/versions?hl=en. > -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
