Re: FeatureRequest
You should be using the Export feature for this. That's it's purpose :) - Davey On Sep 2, 2009, at 03:04 PM, ZeFish wrote: Would it be possible to get a little utility Remove .svn folder in the versions app? I often get to use the same code as another project and copying them to the new project also copy the little .svn inside. Maybe force add could remove them?! --~--~-~--~~~---~--~~ 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: Resolving conflicts
I wrote up some directions with screenshots on how to use Filemerge here: http://daveyshafik.com/archives/681-resolving-svn-conflicts-with-filemergeapp-on-os-x.html - Davey On Aug 13, 2009, at 06:11 PM, Appfire wrote: I am trying to understand how can I use filemerge to resolve conflicts but with very little documentation I have had no luck. If user A and user B gets code from Subversion and user a commits the change and then user B commits the change we run into out of date issue. Sometime when I update this file, Versions is smart enough to merge the changes and all I have to do is commit. But when Subversion is not smart enough, it brings down a few files with extension .mine, .versionx and .versiony. I am coming from Perforce where at this point of time I would be given option to see my file, the repository file an then I can pick and choose. When I try to use options choose left, or choose right and try to save it asks me to save as a different file name. Can someone please explain how are we supposed to do a 3-way merge? We are making decision soon if we should be using this client for our company. Thanks --~--~-~--~~~---~--~~ 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: Dealing with conflicts
In your scenario, .mine should be left, .r35 should be right, .r33 should be ancestor and the original should be merge. If you don't see the latter two options in the filemerge open dialog take the resize handle on the window and drag down :) Then use cmd+d to go to the first/next conflict and use the dropdown at bottom-right to choose which to put in the final file. You can choose one or the other or both and choose which is added first. HTH Sent from my iPhone On Jun 16, 2009, at 5:16 PM, travisjbeck smoothopera...@gmail.com wrote: I've seen several messages about conflicts posted to this group, but none seem to answer my questions about how to handle them. here's the scenario: I've made changes to a application.js file. i do a pre-commit update. SVN notices a conflict with the js file because someone else has edited the same js file and commited the changes. now i have the following files: a conflicted application.js file with '' markers and is essentially a file with all the code duplicated with those markers application.js.mine (my changes) application.js.r33 application.js.r35 no matter what i do with filemerge i cannot get it to actually merge the differences correctly into a new file. is this just broken or am i doing something wrong? --~--~-~--~~~---~--~~ 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: Still no edu pricing?
Site licenses are also available, pricing for those starts to get intersting if you need more than 100 licenses for Versions. Tell us what your needs are and we'll gladly work out a cost-effective offer. you misspelled interEsting :) - Davey On Dec 11, 2008, at 12:02 PM, Koen Bok wrote: Dear all, We announced Volume and EDU pricing. See https://register.madebysofa.com/versions/buy for the details and sorry to keep you waiting. Kindest regards, Koen Bok - madebysofa.com On Dec 10, 7:37 pm, Kerri Miller [EMAIL PROTECTED] wrote: On Dec 10, 2008, at 10:24 AM, buckthorn wrote: Pressing them (politely and respectfully) for definitive info on this is entirely justified. 2 key words there :) -k- --~--~-~--~~~---~--~~ 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 [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
Re: Export button far away?
Right click the toolbar and customize, the button is just not in the default set — drag and drop it where you want it. - Davey On Nov 18, 5:47 pm, figure8 [EMAIL PROTECTED] wrote: Hey When i checkout a repository i download it, but when i want to use the code in project i have to export it, right? But why isn't there an export button in the icon bar, i have to right click? Or am i wrong? --~--~-~--~~~---~--~~ 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 [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/versions?hl=en -~--~~~~--~~--~--~---
