Re: workflow with multiple people editing same files

2008-11-20 Thread Ray
If you are committing any version of the config file to the repository, then maybe you should think about branching -- you could have dev, staging, and production branches of the file -- then nothing you did to your dev config would have anything to do with your production config. But if you neede

Re: workflow with multiple people editing same files

2008-11-20 Thread joseph
OK i see. I think our issues are a little different, but svn:ignore could be useful, I didnt know about that. My repository submits to a live server with config details set for the live web server, so if this is over-written by my working copy the live site will stop working. Similarly, if I upda

Re: workflow with multiple people editing same files

2008-11-19 Thread Ray
You could have a file called copy-me-as-config.txt, which would serve as the un-filled out template config file under version control with no sensitive information in it.When you change how the system works, you would commit changes to copy-me-as-config.txt, and if that file ever changed, you would

Re: workflow with multiple people editing same files

2008-11-19 Thread joseph
Hi Ray, I read the post, but dont get it. I dont want the config file to be updated or committed, as my repository has live server details, my working copy has development server 1 details, and my colleagues has development server 2 detiails. What do you mean exactly when you say 'ignore'? and p

Re: workflow with multiple people editing same files

2008-11-19 Thread Ray
I had the same question a couple weeks ago: http://groups.google.com/group/versions/browse_thread/thread/0c42dad6ae82f53f -Ray --~--~-~--~~~---~--~~ You received this message because you are subscribed to the Google Groups "Versions" group. To post to this group,

Re: workflow with multiple people editing same files

2008-11-19 Thread joseph
Thanks for your responses, I think I've made a lot more sense of this now. Just a last one, I have a config.php file that is different on development, staging and live versions and I want to be able to hide or lock or ignore it so that my updates will not try to commit it, even though my local co

Re: workflow with multiple people editing same files

2008-11-18 Thread Dirk Stoop
On Nov 18, 11:11 pm, Ray <[EMAIL PROTECTED]> wrote: > On Tue, Nov 18, 2008 at 4:52 PM, joseph <[EMAIL PROTECTED]> wrote: > > 1) why does Versions create 3 extra versions of the file if there is a > > conflict? They kind of get in the way as I always have to modify the > > main file and dont look

Re: workflow with multiple people editing same files

2008-11-18 Thread Ray
On Tue, Nov 18, 2008 at 4:52 PM, joseph <[EMAIL PROTECTED]> wrote: > 1) why does Versions create 3 extra versions of the file if there is a > conflict? They kind of get in the way as I always have to modify the > main file and dont look at the .mine, .r19, .r20 ? Can it not just say > "conflict, h

Re: workflow with multiple people editing same files

2008-11-18 Thread joseph
Forgot one thing - is it generally good practice to commit one file at a time with a comment for each? (obviously there may be exceptions where a group of files should be added at the same time) --~--~-~--~~~---~--~~ You received this message because you are subscri

Re: workflow with multiple people editing same files

2008-11-18 Thread joseph
That's a very in-depth response, Daniel, thank you! I have read through the links you posted and the main realisation that I have come to is that SVN does the clever stuff like merging, versioning, etc., and Versions app just provides a friendly interface to invoke those clever tools. I have a few

Re: workflow with multiple people editing same files

2008-11-18 Thread Daniel
> ... At the moment myself and another are working > on the same project, committing our changes to beanstalk using > Versions each evening. You might want to consider committing your changes a bit more often, and at more meaningful times (if that applies to what you're working on). Committing on

workflow with multiple people editing same files

2008-11-18 Thread joseph
This is a bit of a newbie question, but I cannot get clarity on this, and would like some help. At the moment myself and another are working on the same project, committing our changes to beanstalk using Versions each evening. What is the correct process / workflow for committing these files? I