Re: Merge
I really really wish Sofa would have the same kind of user feedback system as Those Other Guys, so that we knew they were listening and responding to feedback. I know people have been begging for merge/ switch capability from the beginning, but the lack of acknowledgment from the development team is discouraging. Are they working on this? How close are we to a 2.0 release? Not that their main competitor has the feature, I’m a 14-day trial away from switching apps. I own a copy of Versions. I love Versions. I love the simplification of its features and the cleanliness of the UI. BUT, really, merge/ switch is the deal-breaker. I’m using SmartSVN right now just for that function, but I hate its interface and the fact that there are far too many options that I don’t ever need to use (not a developer). Just to stop using SmartSVN, I would buy Cornerstone instead. Really really wish the Versions team would post something — anything — about future development. -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
It's a shame really. If it had merge it would be the best looking and working without a shadow of a doubt. Why do great looking apps always lack key functionality! Cue On 11 Jan 2011, at 20:04, Charles Fahey wrote: > Hi Steve, > > Just to clarify, Kaleidoscope does not merge. It only displays > differences between files - beautifully I might add. But no merging in > Kaleidoscope. > > - Charles > > On Jan 10, 6: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 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 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 versi...@googlegroups.com. > To unsubscribe from this group, send email to > versions+unsubscr...@googlegroups.com. > 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
Hi Steve, Just to clarify, Kaleidoscope does not merge. It only displays differences between files - beautifully I might add. But no merging in Kaleidoscope. - Charles On Jan 10, 6: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 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 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
Indeed it does come with dev tools and text wrangler works just as well with Versions as does Apples native FileMerge. The ingenius part of text wrangler is the ability to have the freedom to choose what gets merged where so on so forth. Kaleidoscope however is more or less a difference tool. TortoiseSVN without a shadow of a doubt covers all aspects and requirements of all types of version control. Which begs the question, will there ever be a tool that can ever match it on MAC? Not for another 10 years I highly doubt... On 10 Jan 2011, at 23:32, 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 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 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 versi...@googlegroups.com. > To unsubscribe from this group, send email to > versions+unsubscr...@googlegroups.com. > 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
We're talking about svn-merge/branch/switch functionality, which is a very key part of SVN. Not diff/merge stuff :) Shan On Jan 10, 5: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 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 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
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 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 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 versi...@googlegroups.com. > To unsubscribe from this group, send email to > versions+unsubscr...@googlegroups.com. > 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
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 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 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
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 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
My comment about discussing Merge on this list was to make this point: The list is hosted by Sofa. It's their living room and we're guests invited to discuss Versions. Comments comparing Versions and other products would probably be very helpful to people who are still in the decision making process. There are other places to post that. I hope that you all do. Here, I like the generally low but relevant traffic. I think it's most appropriate to talk about how we get the most out of Versions. Ask for features, compare and contrast with the competition, but don't plug the competition. Perhaps it's a matter of the amount of discussion and the tone. FWIW, I never would have gotten version control adopted in our web shop without a GUI like Versions to make it easy to use and accept. Then, once you've got people and processes put together around version control, maybe you can move on to a different tool. On 1/3/11 3:42 PM, ct-scan 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. -- Mike Combs | m...@combsnet.com | 978-677-6688 (home) -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
Hi, just to chime in: personally I donot need merge, currently just working on my dissertation from a local repository. But that need could occur in the future… I've had the occasional looks at Cornerstone but could find my way around more easily in Versions. I prefer the diff via TextWrangler then within Cornerstone. THOUGH, there are still some things which annoy me in Versions: like, when drilling down in the folder hierarchy of my project(s), switching the view to sth. else and then going back, still this view isn't remembered. Anyway, I hope Versions will continue to evolve. Happy new Year, Rolf Am 05.01.2011 um 01:45 schrieb Charles Fahey: > I share everyone's interest in this feature. > > Unfortunately, if you look at Sofa's other product Kaleidoscope, it is > also nicely designed, and also suffers from a surreptitiously missing > feature: the ability to merge differences. That's right, it's a diff > tool that only displays differences. > > Sofa seems to make software that's pretty, but dumb. > > Cornerstone is the only way to go. > > I've been waiting for Versions and K-Scope to improve since betas, but > there have been no substantial technical updates. > > On Jan 3, 3:42 pm, ct-scan 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 versi...@googlegroups.com. > To unsubscribe from this group, send email to > versions+unsubscr...@googlegroups.com. > 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
Looking at how many people work at sofa I think they're actually up to something, something with their current software. They're most likely not telling us due to 'apple-like' tactics where they don't want to tell us XYZ and then not deliver Z. I personally don't need merge and don't use kaleidoscope, I can see where you guys are coming from though. And that's it's a desirable feature. There has been a of serious updates hence me thinking there's something big in the works, something that'll make you stop thinking about anything else for the coming months. In the end it's up to sofa to deliver and I see that you guys are getting a bit impatient. I reckon we should wait for a reply from sofa and see what they have to say. Jorde On 5 jan. 2011, at 01:45, Charles Fahey wrote: > I share everyone's interest in this feature. > > Unfortunately, if you look at Sofa's other product Kaleidoscope, it is > also nicely designed, and also suffers from a surreptitiously missing > feature: the ability to merge differences. That's right, it's a diff > tool that only displays differences. > > Sofa seems to make software that's pretty, but dumb. > > Cornerstone is the only way to go. > > I've been waiting for Versions and K-Scope to improve since betas, but > there have been no substantial technical updates. > > On Jan 3, 3:42 pm, ct-scan 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 versi...@googlegroups.com. > To unsubscribe from this group, send email to > versions+unsubscr...@googlegroups.com. > 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
I share everyone's interest in this feature. Unfortunately, if you look at Sofa's other product Kaleidoscope, it is also nicely designed, and also suffers from a surreptitiously missing feature: the ability to merge differences. That's right, it's a diff tool that only displays differences. Sofa seems to make software that's pretty, but dumb. Cornerstone is the only way to go. I've been waiting for Versions and K-Scope to improve since betas, but there have been no substantial technical updates. On Jan 3, 3:42 pm, ct-scan 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
It would be nice to get a response from Sofa as to wether or not Merge is even in the works... -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
Hey Mike - I see your point, but my aim wasn't to plug the competition. I tried Versions out and found it lacking, so its only natural to offer up some kind of benchmark for what I see as a superior product. Versions needs to up their ante, because there are alot of new and improved tools coming up in this field. How else can they do it without by honest feedback from users? On Dec 31 2010, 8:05 am, Mike Combs wrote: > No offense intended, and I'm just a Versions user, but I think it's rude > to use this thread to plug the competition. Surely there must be other > forums for that, where people are still trying to decide which tool to use. > > To everyone: Happy New Year! > > On 12/30/10 7:20 PM, Jay wrote: > > > > > > > > > > > I've had to do the same, switched to Cornerstone 2 - merging from the > > command line combined with no option to remove the user name from the > > repo url on checkout made Cornerstone attractive. > > > On Dec 30, 2:36 am, TT wrote: > >> hey gabe, thanks for providing a link to Cornerstone 2. i wasn't aware > >> of it before, but I am definitely switching now, since the pace of > >> development for Versions has been monumentally disappointing. > > >> On 29 дец, 19:08, gabe wrote: > > >>> Just picked up Versions. After using it quite a bit, its a pretty user- > >>> friendly tool, but frankly, it needs merge capability to be taken > >>> seriously. Cornerstone 2 looks amazing - it has merge, and a built in > >>> comparison tool. I may pick it up instead. If anyone else is > >>> interested its athttp://www.zennaware.com/cornerstone/index.php > >>> Versions Team - I highly recommend to you build merge capability into > >>> your app. > >>> - Gabe > > -- > Mike Combs | m...@combsnet.com | 978-677-6688 (home) -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
I agree to some extent. For those that don't necessarily require merge are happy with a fancy interface that works well for what it does. What bugs me is that sometimes it feels like Versions is too comfortable and doesn't see any competition. The truth in the matter is that when you invest in a product, you expect that product to dwell on your needs, like every other paid for product. We've seen a useful update recently, and for the price of Versions I'm happy with it. But if nobody starts to mention what other products are capable of doing we all stuck with a product that will sluggishly deliver bits and pieces to keep us hoping. Ask yourselves, how much longer will you wait for features that already exist elsewhere? Does money really become an issue then? The reality is, if we don't give the competition some limelight Versions won't fight back. I think we all agree that there is only one feature that can change the life cycle of this product. It's time to put your money where your mouth is and deliver! Not saying that in a horrible way of course! On 31 Dec 2010, at 22:47, Matthew Alan Young wrote: > It's more of like this, for me I bought versions long ago and suggested and > asked for merge since the beginning. Never got the feature. Very frustrated > and eventually paid even more for Cornerstone... when wanted it in Versions > the whole time. If it had not been for someone making the "plug" as you call > it, I might have never known... and would have been stuck with lackluster > features. I think it's rude all of us have been led on as far as Versions > development, and I think the lot of us are trying to get Dirk and his devs to > listen and come through and maybe even beat Cornerstone, since we already > invested in the Versions product. > > On Dec 31, 2010, at 8:05 AM, Mike Combs wrote: > >> No offense intended, and I'm just a Versions user, but I think it's rude to >> use this thread to plug the competition. Surely there must be other forums >> for that, where people are still trying to decide which tool to use. >> >> To everyone: Happy New Year! >> >> On 12/30/10 7:20 PM, Jay wrote: >>> I've had to do the same, switched to Cornerstone 2 - merging from the >>> command line combined with no option to remove the user name from the >>> repo url on checkout made Cornerstone attractive. >>> >>> On Dec 30, 2:36 am, TT wrote: hey gabe, thanks for providing a link to Cornerstone 2. i wasn't aware of it before, but I am definitely switching now, since the pace of development for Versions has been monumentally disappointing. On 29 дец, 19:08, gabe wrote: > Just picked up Versions. After using it quite a bit, its a pretty user- > friendly tool, but frankly, it needs merge capability to be taken > seriously. Cornerstone 2 looks amazing - it has merge, and a built in > comparison tool. I may pick it up instead. If anyone else is > interested its athttp://www.zennaware.com/cornerstone/index.php > Versions Team - I highly recommend to you build merge capability into > your app. > - Gabe >> >> -- >> Mike Combs | m...@combsnet.com | 978-677-6688 (home) >> >> -- >> You received this message because you are subscribed to the Google Groups >> "Versions" group. >> To post to this group, send email to versi...@googlegroups.com. >> To unsubscribe from this group, send email to >> versions+unsubscr...@googlegroups.com. >> 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 versi...@googlegroups.com. > To unsubscribe from this group, send email to > versions+unsubscr...@googlegroups.com. > 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
It's more of like this, for me I bought versions long ago and suggested and asked for merge since the beginning. Never got the feature. Very frustrated and eventually paid even more for Cornerstone... when wanted it in Versions the whole time. If it had not been for someone making the "plug" as you call it, I might have never known... and would have been stuck with lackluster features. I think it's rude all of us have been led on as far as Versions development, and I think the lot of us are trying to get Dirk and his devs to listen and come through and maybe even beat Cornerstone, since we already invested in the Versions product. On Dec 31, 2010, at 8:05 AM, Mike Combs wrote: > No offense intended, and I'm just a Versions user, but I think it's rude to > use this thread to plug the competition. Surely there must be other forums > for that, where people are still trying to decide which tool to use. > > To everyone: Happy New Year! > > On 12/30/10 7:20 PM, Jay wrote: >> I've had to do the same, switched to Cornerstone 2 - merging from the >> command line combined with no option to remove the user name from the >> repo url on checkout made Cornerstone attractive. >> >> On Dec 30, 2:36 am, TT wrote: >>> hey gabe, thanks for providing a link to Cornerstone 2. i wasn't aware >>> of it before, but I am definitely switching now, since the pace of >>> development for Versions has been monumentally disappointing. >>> >>> On 29 дец, 19:08, gabe wrote: >>> >>> >>> Just picked up Versions. After using it quite a bit, its a pretty user- friendly tool, but frankly, it needs merge capability to be taken seriously. Cornerstone 2 looks amazing - it has merge, and a built in comparison tool. I may pick it up instead. If anyone else is interested its athttp://www.zennaware.com/cornerstone/index.php Versions Team - I highly recommend to you build merge capability into your app. - Gabe > > -- > Mike Combs | m...@combsnet.com | 978-677-6688 (home) > > -- > You received this message because you are subscribed to the Google Groups > "Versions" group. > To post to this group, send email to versi...@googlegroups.com. > To unsubscribe from this group, send email to > versions+unsubscr...@googlegroups.com. > 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
On Fri, Dec 31, 2010 at 11:05 AM, Mike Combs wrote: > No offense intended, and I'm just a Versions user, but I think it's rude to > use this thread to plug the competition. Surely there must be other forums > for that, where people are still trying to decide which tool to use. Agreed. The merge thing is something everybody is aware of, including (I am sure) the Versions team. -- ;; Gabe Johnson ;; PhD Candidate in Computational Design - Carnegie Mellon University ;; CoDe Lab: http://code.arc.cmu.edu/ ;; Personal: http://six11.org/ -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
No offense intended, and I'm just a Versions user, but I think it's rude to use this thread to plug the competition. Surely there must be other forums for that, where people are still trying to decide which tool to use. To everyone: Happy New Year! On 12/30/10 7:20 PM, Jay wrote: I've had to do the same, switched to Cornerstone 2 - merging from the command line combined with no option to remove the user name from the repo url on checkout made Cornerstone attractive. On Dec 30, 2:36 am, TT wrote: hey gabe, thanks for providing a link to Cornerstone 2. i wasn't aware of it before, but I am definitely switching now, since the pace of development for Versions has been monumentally disappointing. On 29 дец, 19:08, gabe wrote: Just picked up Versions. After using it quite a bit, its a pretty user- friendly tool, but frankly, it needs merge capability to be taken seriously. Cornerstone 2 looks amazing - it has merge, and a built in comparison tool. I may pick it up instead. If anyone else is interested its athttp://www.zennaware.com/cornerstone/index.php Versions Team - I highly recommend to you build merge capability into your app. - Gabe -- Mike Combs | m...@combsnet.com | 978-677-6688 (home) -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
I've had to do the same, switched to Cornerstone 2 - merging from the command line combined with no option to remove the user name from the repo url on checkout made Cornerstone attractive. On Dec 30, 2:36 am, TT wrote: > hey gabe, thanks for providing a link to Cornerstone 2. i wasn't aware > of it before, but I am definitely switching now, since the pace of > development for Versions has been monumentally disappointing. > > On 29 дец, 19:08, gabe wrote: > > > > > Just picked up Versions. After using it quite a bit, its a pretty user- > > friendly tool, but frankly, it needs merge capability to be taken > > seriously. Cornerstone 2 looks amazing - it has merge, and a built in > > comparison tool. I may pick it up instead. If anyone else is > > interested its athttp://www.zennaware.com/cornerstone/index.php > > > Versions Team - I highly recommend to you build merge capability into > > your app. > > > - Gabe -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge
hey gabe, thanks for providing a link to Cornerstone 2. i wasn't aware of it before, but I am definitely switching now, since the pace of development for Versions has been monumentally disappointing. On 29 дец, 19:08, gabe wrote: > Just picked up Versions. After using it quite a bit, its a pretty user- > friendly tool, but frankly, it needs merge capability to be taken > seriously. Cornerstone 2 looks amazing - it has merge, and a built in > comparison tool. I may pick it up instead. If anyone else is > interested its athttp://www.zennaware.com/cornerstone/index.php > > Versions Team - I highly recommend to you build merge capability into > your app. > > - Gabe -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: merge
I found it to be rather slow though. Not only merging but the application in general. Though that might be due to the size of the repo I tested it with. Kindest regards, Marijn On Nov 18, 12:31 am, Cue wrote: > I agree. Cornerstone's merge methodology works well in at least the basic > way. I haven't yet had the unfortunate experience of having to merge heavy > conflicts so I cannot speculate to that extent. But it does the job, and if > Versions incorporated such a feature I may just hang on to it > > Cue > > On 17 Nov 2010, at 20:28, Rob Rye wrote: > > > > > > > On Nov 13, 2010, at 2:24 AM, Chris Muktar wrote: > > >> No GUI app supports > >> this very well, but it would be the killer feature of Versions if it > >> did- even cornerstone doesn't have that. As teams grow, using merge > >> becomes ESSENTIAL and there needs to be a GUI for doing it (even if > >> it's just basic merge operations) as doing it on the command line is > >> hairy. > > > What is wrong with Cornerstone's support of merge? It seems to be quite > > effective to me. > > > Rob > > > -- > > You received this message because you are subscribed to the Google Groups > > "Versions" group. > > To post to this group, send email to versi...@googlegroups.com. > > To unsubscribe from this group, send email to > > versions+unsubscr...@googlegroups.com. > > For more options, visit this group > > athttp://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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: merge
I agree. Cornerstone's merge methodology works well in at least the basic way. I haven't yet had the unfortunate experience of having to merge heavy conflicts so I cannot speculate to that extent. But it does the job, and if Versions incorporated such a feature I may just hang on to it Cue On 17 Nov 2010, at 20:28, Rob Rye wrote: > > On Nov 13, 2010, at 2:24 AM, Chris Muktar wrote: > >> No GUI app supports >> this very well, but it would be the killer feature of Versions if it >> did- even cornerstone doesn't have that. As teams grow, using merge >> becomes ESSENTIAL and there needs to be a GUI for doing it (even if >> it's just basic merge operations) as doing it on the command line is >> hairy. >> > > What is wrong with Cornerstone's support of merge? It seems to be quite > effective to me. > > Rob > > -- > You received this message because you are subscribed to the Google Groups > "Versions" group. > To post to this group, send email to versi...@googlegroups.com. > To unsubscribe from this group, send email to > versions+unsubscr...@googlegroups.com. > 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: merge
On Nov 13, 2010, at 2:24 AM, Chris Muktar wrote: > No GUI app supports > this very well, but it would be the killer feature of Versions if it > did- even cornerstone doesn't have that. As teams grow, using merge > becomes ESSENTIAL and there needs to be a GUI for doing it (even if > it's just basic merge operations) as doing it on the command line is > hairy. > What is wrong with Cornerstone's support of merge? It seems to be quite effective to me. Rob -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge...
Well, I don't have time to go into gory detail, so I suggest reading the book URL below. If you prefer a single HTML page so you don't have to click through lots of individual pages, this URL will also jump you to that chapter: http://svnbook.red-bean.com/en/1.5/svn-book.html#svn.branchmerge When you create a branch, it happens via an `svn copy` command, which not only makes the copy, but also sets some invisible properties on the branch, so SVN can tell where (and when) it was copied from. As development proceeds on both the trunk and the branch, you can "pull" updates from the trunk (origin) to the branch by calling `svn merge` from the branch. If there are any conflicts (such as file segments that were modified in both trunk and branch) they need to be resolved manually. If both trunk and branch are fairly active, it's a good idea to merge from trunk to branch regularly to minimize conflicts and become aware of them earlier. When you want to migrate changes made in the branch back to the branch, you use `svn merge --reintegrate`, with the last option signifying you're going in the opposite direction, back to the source. NOTE: The invisible property I'm talking about is called svn:mergeinfo, and is maintained automatically when you're using SVN 1.5+. You can view this information directly via `svn propget svn:mergeinfo path`, or use the `svn mergeinfo URL` command. It's also described in the book. Hope that helps, - Quinn On May 24, 2010, at 7:17 AM, james wrote: > Thanks for the post Quinn, I am however completely lost! > > I have a Branch 'sandbox' which is sitting at revision 251 and the > trunk (which has has a couple of changes since checkout of sandbox) is > 247, any help on this would be great, did manage to run a diff via > terminal, but still completely lost... > > > On May 12, 5:27 pm, Quinn Taylor wrote: >> From Terminal, you'll want to look at using `svn merge -- >> reintegrate ...` — you can find more detail by typing `svn help >> merge`. This assumes you're using SVN 1.5+. Also check out the SVN >> book parts on merging. >> >> http://svnbook.red-bean.com/en/1.5/svn.branchmerge.html >> >> - Quinn >> >> On May 12, 2010, at 8:44 AM, james wrote: >> >>> Ok so I have read a lo about how merge isn't (yet) within Version, but >>> I have created a brach from the main trunk which i'm using as a >>> sandbox, to check and develop a site with, then once happy I wanted to >>> drop everything onto the trunk. Seeing as this is not with-in versions >>> how can I go about getting this done? smime.p7s Description: S/MIME cryptographic signature
Re: Merge...
Thanks for the post Quinn, I am however completely lost! I have a Branch 'sandbox' which is sitting at revision 251 and the trunk (which has has a couple of changes since checkout of sandbox) is 247, any help on this would be great, did manage to run a diff via terminal, but still completely lost... On May 12, 5:27 pm, Quinn Taylor wrote: > From Terminal, you'll want to look at using `svn merge -- > reintegrate ...` — you can find more detail by typing `svn help > merge`. This assumes you're using SVN 1.5+. Also check out the SVN > book parts on merging.http://svnbook.red-bean.com/en/1.5/svn.branchmerge.html > > - Quinn > > On May 12, 2010, at 8:44 AM, james wrote: > > > > > Ok so I have read a lo about how merge isn't (yet) within Version, but > > I have created a brach from the main trunk which i'm using as a > > sandbox, to check and develop a site with, then once happy I wanted to > > drop everything onto the trunk. Seeing as this is not with-in versions > > how can I go about getting this done? > > > -- > > You received this message because you are subscribed to the Google > > Groups "Versions" group. > > To post to this group, send email to versi...@googlegroups.com. > > To unsubscribe from this group, send email to > > versions+unsubscr...@googlegroups.com > > . > > For more options, visit this group > > athttp://groups.google.com/group/versions?hl=en > > . > > > > smime.p7s > 8KViewDownload -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge...
From Terminal, you'll want to look at using `svn merge -- reintegrate ...` — you can find more detail by typing `svn help merge`. This assumes you're using SVN 1.5+. Also check out the SVN book parts on merging. http://svnbook.red-bean.com/en/1.5/svn.branchmerge.html - Quinn On May 12, 2010, at 8:44 AM, james wrote: Ok so I have read a lo about how merge isn't (yet) within Version, but I have created a brach from the main trunk which i'm using as a sandbox, to check and develop a site with, then once happy I wanted to drop everything onto the trunk. Seeing as this is not with-in versions how can I go about getting this done? -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com . For more options, visit this group at http://groups.google.com/group/versions?hl=en . smime.p7s Description: S/MIME cryptographic signature
Re: Merge branches and trunk
I use DiffMerge on OSX - its not anywhere near as polished.. and it takes a few steps. http://www.sourcegear.com/diffmerge/screenshots.html Make sure you have both trunk/branch(s) you want to merge, open diffmerge, pick your source/target directories. then it will show you all the differences, and you can manually make the merges, then re- checkin. Its not fancy, and not without effort - but until merging is in versions app, this works for me. Phil On Dec 2, 5:48 pm, Joe Wicentowski wrote: > +1 on "merge" support, as well as a related feature, "cherrypick" > > > > On Wed, Dec 2, 2009 at 3:38 PM, mun wrote: > > workflow is entirely different but definitely +1 on "merge" support. > > .m > > > On Dec 1, 1:54 pm, Zanfe wrote: > >> Hi all, > >> I'd explain my doubts. > > >> I usually have the stable version of my site in the trunk and I work, > >> for the updates, in a branch. > >> When I complete my updates I would put my branch version in the trunk, > >> but if I drag my files and directory on the trunk, Versions doesn't > >> overwrite the directories and so I can't overwrite the trunk. > >> So I try to export the branch version and put the exported files and > >> directories in the trunk but Versions doesn't like this operation and > >> doesn't permitt me to commit. > > >> The only way to be able to put my branch version in the trunk and to > >> commit it is to delete, form Versions, the trunck files, to commit, to > >> put exported branch files in the trunk, to add files and directories > >> and at last to commit the new trunk. > > >> Is it the only way to "merge" branch version with trunk version? > >> Is not possible, in some way, drag branch files and directories on the > >> trunk without problems? > > >> Thanks a lot > >> Bye > >> Z > > > -- > > > You received this message because you are subscribed to the Google Groups > > "Versions" group. > > To post to this group, send email to versi...@googlegroups.com. > > To unsubscribe from this group, send email to > > versions+unsubscr...@googlegroups.com. > > For more options, visit this group > > athttp://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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge branches and trunk
+1 on "merge" support, as well as a related feature, "cherrypick" On Wed, Dec 2, 2009 at 3:38 PM, mun wrote: > workflow is entirely different but definitely +1 on "merge" support. > .m > > On Dec 1, 1:54 pm, Zanfe wrote: >> Hi all, >> I'd explain my doubts. >> >> I usually have the stable version of my site in the trunk and I work, >> for the updates, in a branch. >> When I complete my updates I would put my branch version in the trunk, >> but if I drag my files and directory on the trunk, Versions doesn't >> overwrite the directories and so I can't overwrite the trunk. >> So I try to export the branch version and put the exported files and >> directories in the trunk but Versions doesn't like this operation and >> doesn't permitt me to commit. >> >> The only way to be able to put my branch version in the trunk and to >> commit it is to delete, form Versions, the trunck files, to commit, to >> put exported branch files in the trunk, to add files and directories >> and at last to commit the new trunk. >> >> Is it the only way to "merge" branch version with trunk version? >> Is not possible, in some way, drag branch files and directories on the >> trunk without problems? >> >> Thanks a lot >> Bye >> Z > > -- > > You received this message because you are subscribed to the Google Groups > "Versions" group. > To post to this group, send email to versi...@googlegroups.com. > To unsubscribe from this group, send email to > versions+unsubscr...@googlegroups.com. > 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 versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge branches and trunk
workflow is entirely different but definitely +1 on "merge" support. .m On Dec 1, 1:54 pm, Zanfe wrote: > Hi all, > I'd explain my doubts. > > I usually have the stable version of my site in the trunk and I work, > for the updates, in a branch. > When I complete my updates I would put my branch version in the trunk, > but if I drag my files and directory on the trunk, Versions doesn't > overwrite the directories and so I can't overwrite the trunk. > So I try to export the branch version and put the exported files and > directories in the trunk but Versions doesn't like this operation and > doesn't permitt me to commit. > > The only way to be able to put my branch version in the trunk and to > commit it is to delete, form Versions, the trunck files, to commit, to > put exported branch files in the trunk, to add files and directories > and at last to commit the new trunk. > > Is it the only way to "merge" branch version with trunk version? > Is not possible, in some way, drag branch files and directories on the > trunk without problems? > > Thanks a lot > Bye > Z -- You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versi...@googlegroups.com. To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/versions?hl=en.
Re: Merge feature
I have 3 mac users switching from PC in the office and using Versions, they are all crying for merge. So I guess that makes +3 On May 7, 4:15 pm, jcdesrochers wrote: > Just a quick question about Versions development road map do you > plan in a near future to add merge support??? If so... any ETA?? > > I'm evaluating the svn clients for mac and the merge functionality is > a must for us. > > Thanks for answering. > > Regards, > J-C --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: Merge feature
Yep, +1 here too. I introduced SVN to our shop in the last month. With our staff still grasping concepts, keeping all the interaction within one UI will encourage us all to become Versions evangelists, not to mention depend all the more on your tool instead of searching for alternatives. Cheers, -- Eric DB www.mydbsolution.com On Jun 14, 5:44 pm, Robin Charlton wrote: > +1 for me. > Having recently moved from Perforce to SVN I'm a little surprised how poorly > supported merging is (in general). In the past we'd create branches for any > non-trivial development task and integrate back into the trunk only after > acceptance testing. > > Whilst Perforce's clients are certainly no shining example of usability they > do support a very capable merging GUI. Of course it is rather > pricey in comparison. ;-) > ~ > Robin | m...@robincharlton.me | twitter: robincharlton > > 2009/6/14 echo > > > > > I bought and use Versions, and use Subcommander for svn merge + svn > > switch. I guess I'll add my +1 on the chance it might help to > > influence the developers, and add what I posted a year ago, expanding > > on Ray's suggestion to share how we use our tools.. > > > Our workflow uses developer branches, that we merge from a dev branch. > > We then switch our working copy to the dev branch, merge remote dev > > with second source of our branch (now remote), then merge that back to > > remote dev branch, then switch our wc back to our branch. > > > In Subcommander, merge is from a contextual menu of a revision (or > > span of revisions) from a log. switch is from a contextual menu from a > > browse repository view. > > > On Jun 1, 7:30 am, Ray wrote: > > > I've never used a tool other than command line svn and a text editor to > > > handle merges because all of my merging has been pretty simple. However, > > I > > > would probably become more adventurous with what I used merging for if I > > had > > > a good tool to help me with it. > > > To make this thread more helpful to the Versions team, would people be > > > willing to outline what they like or don't like about the merge tools > > they > > > currently use? Then Versions may become even more of an obvious choice. > > > > -Ray --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: Merge feature
+1 for me. Having recently moved from Perforce to SVN I'm a little surprised how poorly supported merging is (in general). In the past we'd create branches for any non-trivial development task and integrate back into the trunk only after acceptance testing. Whilst Perforce's clients are certainly no shining example of usability they do support a very capable merging GUI. Of course it is rather pricey in comparison. ;-) ~ Robin | m...@robincharlton.me | twitter: robincharlton 2009/6/14 echo > > I bought and use Versions, and use Subcommander for svn merge + svn > switch. I guess I'll add my +1 on the chance it might help to > influence the developers, and add what I posted a year ago, expanding > on Ray's suggestion to share how we use our tools.. > > Our workflow uses developer branches, that we merge from a dev branch. > We then switch our working copy to the dev branch, merge remote dev > with second source of our branch (now remote), then merge that back to > remote dev branch, then switch our wc back to our branch. > > In Subcommander, merge is from a contextual menu of a revision (or > span of revisions) from a log. switch is from a contextual menu from a > browse repository view. > > On Jun 1, 7:30 am, Ray wrote: > > I've never used a tool other than command line svn and a text editor to > > handle merges because all of my merging has been pretty simple. However, > I > > would probably become more adventurous with what I used merging for if I > had > > a good tool to help me with it. > > To make this thread more helpful to the Versions team, would people be > > willing to outline what they like or don't like about the merge tools > they > > currently use? Then Versions may become even more of an obvious choice. > > > > -Ray > > > --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: Merge feature
I bought and use Versions, and use Subcommander for svn merge + svn switch. I guess I'll add my +1 on the chance it might help to influence the developers, and add what I posted a year ago, expanding on Ray's suggestion to share how we use our tools.. Our workflow uses developer branches, that we merge from a dev branch. We then switch our working copy to the dev branch, merge remote dev with second source of our branch (now remote), then merge that back to remote dev branch, then switch our wc back to our branch. In Subcommander, merge is from a contextual menu of a revision (or span of revisions) from a log. switch is from a contextual menu from a browse repository view. On Jun 1, 7:30 am, Ray wrote: > I've never used a tool other than command line svn and a text editor to > handle merges because all of my merging has been pretty simple. However, I > would probably become more adventurous with what I used merging for if I had > a good tool to help me with it. > To make this thread more helpful to the Versions team, would people be > willing to outline what they like or don't like about the merge tools they > currently use? Then Versions may become even more of an obvious choice. > > -Ray --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: Merge feature
Conflict resolution is a separate issue and feature from merge support — conflicts can occur even without branches or tags, and even with a single developer, so long as there are conflicting edits in multiple working copies. Out of curiosity, do other clients offer conflict resolution? In my experience, there is no single quick fix for conflicts — each case is different and requires human interaction to figure out which changes to use. (SVN 1.5 added interactive conflict resolution, but there is no way to automatically guess the right thing to do.) - Quinn On Jun 1, 2009, at 6:22 AM, iVira wrote: +1. Version such a great svn client in all other cases. But lack of conflicts resolving... I have to avoid revert my changes, update and add them again. It's such a headache On May 7, 7:15 pm, jcdesrochers wrote: Just a quick question about Versions development road map do you plan in a near future to addmergesupport??? If so... any ETA?? I'm evaluating the svn clients for mac and themergefunctionality is a must for us. Thanks for answering. Regards, J-C --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~--- smime.p7s Description: S/MIME cryptographic signature
Re: Merge feature
Another +1 from me. We're a cross-platform shop so I tend to use TortoiseSVN on Windows to do merges, but a fast, integrated merge window would make Versions much nicer to use. On May 7, 5:15 pm, jcdesrochers wrote: > Just a quick question about Versions development road map do you > plan in a near future to add merge support??? If so... any ETA?? > > I'm evaluating the svn clients for mac and the merge functionality is > a must for us. > > Thanks for answering. > > Regards, > J-C --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: Merge feature
I've never used a tool other than command line svn and a text editor to handle merges because all of my merging has been pretty simple. However, I would probably become more adventurous with what I used merging for if I had a good tool to help me with it. To make this thread more helpful to the Versions team, would people be willing to outline what they like or don't like about the merge tools they currently use? Then Versions may become even more of an obvious choice. -Ray --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: Merge feature
+1 here too Sorry, I generally avoid these +1 threads, but Merge seems such an obvious, essential, svn function that is missing from Versions. Pretty much everything else I need is in there. I kept switching between Versions and SmartSVN (for merging) but now I don't bother I'm in SmartSVN all the time despite its rubbish java GUI. Versions was the easy to use app that introduced svn to our team here. It's what everyone adopted as their app of choice as we brought in new svn based workflows. It was a while before we realised this major feature was missing. At the moment I do all the merges but as branch/ merge become more common for us we are deciding whether we switch to another app or hold out for Versions merge support. Paul On 1 Jun 2009, at 14:22, iVira wrote: > > +1. Version such a great svn client in all other cases. But lack of > conflicts resolving... > I have to avoid revert my changes, update and add them again. It's > such a headache > > On May 7, 7:15 pm, jcdesrochers wrote: >> Just a quick question about Versions development road map do you >> plan in a near future to addmergesupport??? If so... any ETA?? >> >> I'm evaluating the svn clients for mac and themergefunctionality is >> a must for us. >> >> Thanks for answering. >> >> Regards, >> J-C --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: Merge feature
+1. Version such a great svn client in all other cases. But lack of conflicts resolving... I have to avoid revert my changes, update and add them again. It's such a headache On May 7, 7:15 pm, jcdesrochers wrote: > Just a quick question about Versions development road map do you > plan in a near future to addmergesupport??? If so... any ETA?? > > I'm evaluating the svn clients for mac and themergefunctionality is > a must for us. > > Thanks for answering. > > Regards, > J-C --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: Merge feature
+1 here. On May 7, 7:15 pm, jcdesrochers wrote: > Just a quick question about Versions development road map do you > plan in a near future to add merge support??? If so... any ETA?? > > I'm evaluating the svn clients for mac and the merge functionality is > a must for us. > > Thanks for answering. > > Regards, > J-C --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: Merge feature
Nope, that's copying, and if you copy a directory to where you store branches, that's branching. Merging is when you consolidate the changes from a branch. - Quinn On May 30, 2009, at 9:53 AM, derekr wrote: Isn't it merging when you hold alt and drag the dir/file into the dir you want to merge with? smime.p7s Description: S/MIME cryptographic signature
Re: Merge feature
Isn't it merging when you hold alt and drag the dir/file into the dir you want to merge with. On May 29, 9:30 am, denisa wrote: > Ditto on the +1 for a Merge feature. > > On May 28, 11:57 pm, drzax wrote: > > > > > Yet another +1. Please. I was so excited about Versions until I > > discovered this was missing. svn switch too. > > > On May 26, 4:32 am, rwgrier wrote: > > > > +1 here. I currently have to fire up another SVN tool (which isn't as > > > nice) to do merges. Please add merging. > > > > On May 7, 12:15 pm, jcdesrochers wrote: > > > > > Just a quick question about Versions development road map do you > > > > plan in a near future to add merge support??? If so... any ETA?? > > > > > I'm evaluating the svn clients for mac and the merge functionality is > > > > a must for us. > > > > > Thanks for answering. > > > > > Regards, > > > > J-C --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: Merge feature
Ditto on the +1 for a Merge feature. On May 28, 11:57 pm, drzax wrote: > Yet another +1. Please. I was so excited about Versions until I > discovered this was missing. svn switch too. > > On May 26, 4:32 am, rwgrier wrote: > > > +1 here. I currently have to fire up another SVN tool (which isn't as > > nice) to do merges. Please add merging. > > > On May 7, 12:15 pm, jcdesrochers wrote: > > > > Just a quick question about Versions development road map do you > > > plan in a near future to add merge support??? If so... any ETA?? > > > > I'm evaluating the svn clients for mac and the merge functionality is > > > a must for us. > > > > Thanks for answering. > > > > Regards, > > > J-C --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: Merge feature
Yet another +1. Please. I was so excited about Versions until I discovered this was missing. svn switch too. On May 26, 4:32 am, rwgrier wrote: > +1 here. I currently have to fire up another SVN tool (which isn't as > nice) to do merges. Please add merging. > > On May 7, 12:15 pm, jcdesrochers wrote: > > > Just a quick question about Versions development road map do you > > plan in a near future to add merge support??? If so... any ETA?? > > > I'm evaluating the svn clients for mac and the merge functionality is > > a must for us. > > > Thanks for answering. > > > Regards, > > J-C --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: Merge feature
+1 here. I currently have to fire up another SVN tool (which isn't as nice) to do merges. Please add merging. On May 7, 12:15 pm, jcdesrochers wrote: > Just a quick question about Versions development road map do you > plan in a near future to add merge support??? If so... any ETA?? > > I'm evaluating the svn clients for mac and the merge functionality is > a must for us. > > Thanks for answering. > > Regards, > J-C --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group, send email to versions@googlegroups.com To unsubscribe from this group, send email to versions+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
