hackalive Posted January 21, 2011 Share Posted January 21, 2011 Hi guys, just a quick question, in CVS what happens if two users try to commit changes at the same time, presumably one will overwrite the others so the first persons changes will no longer exist in the system. Is this correct? Basically if two people (A and B) checkout the same file and make different edits but then A submits his and the B not long after wont As changes no longer exist? Link to comment https://forums.phpfreaks.com/topic/225154-cvs/ Share on other sites More sharing options...
trq Posted January 21, 2011 Share Posted January 21, 2011 The second person will get an error message saying that the file they are working on is out of date, they will then need to update it, which will in turn force them to merge the first persons changes into there own. [ot] Who the help uses CVS anymore? [/ot] Link to comment https://forums.phpfreaks.com/topic/225154-cvs/#findComment-1162852 Share on other sites More sharing options...
hackalive Posted January 21, 2011 Author Share Posted January 21, 2011 okay so how does the merge affect their alterations (of person B)? (and what other than CVS do you use thorpe?) Link to comment https://forums.phpfreaks.com/topic/225154-cvs/#findComment-1162854 Share on other sites More sharing options...
trq Posted January 21, 2011 Share Posted January 21, 2011 okay so how does the merge affect their alterations (of person B)? They will be shown a diff, and will need to make the decision themselves about what stays and what goes. (and what other than CVS do you use thorpe?) Until recently I had been a subversion user. Over the last few months though I have trialed and since moved all my repos into git. Subversion is probably the most popular still though git is quickly catching up. It's a little different in that it's a distributed system. Link to comment https://forums.phpfreaks.com/topic/225154-cvs/#findComment-1162856 Share on other sites More sharing options...
hackalive Posted January 21, 2011 Author Share Posted January 21, 2011 okay i will look into those, thanks thorpe. I primarily ask becuase i dont like CVS and was looking at making a small system for use on a project of mine. Thanks again. Link to comment https://forums.phpfreaks.com/topic/225154-cvs/#findComment-1162859 Share on other sites More sharing options...
hackalive Posted January 21, 2011 Author Share Posted January 21, 2011 Thorpe, can you explain how git differes from CVS , or link to something that clearly explains GIT, please? Link to comment https://forums.phpfreaks.com/topic/225154-cvs/#findComment-1162861 Share on other sites More sharing options...
trq Posted January 21, 2011 Share Posted January 21, 2011 http://book.git-scm.com/ Link to comment https://forums.phpfreaks.com/topic/225154-cvs/#findComment-1162903 Share on other sites More sharing options...
hackalive Posted January 21, 2011 Author Share Posted January 21, 2011 Thorpe, I was thinking of making my own system which I incorporate with an software update system I built and some other things. Would it be possible to build my own basic one faily simple do you think and where should i get started? I want it to be entirely web-based and not need "installing" like GIT etc, so build it all in PHP is my goal, what do you think? Cheers in advance. Link to comment https://forums.phpfreaks.com/topic/225154-cvs/#findComment-1162940 Share on other sites More sharing options...
salathe Posted January 21, 2011 Share Posted January 21, 2011 Thorpe, I was thinking ... I don't know about thorpe, but I think you're insane. Link to comment https://forums.phpfreaks.com/topic/225154-cvs/#findComment-1162948 Share on other sites More sharing options...
trq Posted January 21, 2011 Share Posted January 21, 2011 I want it to be entirely web-based and not need "installing" like GIT etc, It would still need installing on a server. Which is exactly the same as how subversion and git need to be installed if you want remote access. What do I think? It might be a fun project, but seriously, there is no way it would compete with git or subversion. Link to comment https://forums.phpfreaks.com/topic/225154-cvs/#findComment-1162950 Share on other sites More sharing options...
hackalive Posted January 24, 2011 Author Share Posted January 24, 2011 Thats okay the aim is not and never will be to compete with GIT, it will be for inhouse use only. Now just to get started Link to comment https://forums.phpfreaks.com/topic/225154-cvs/#findComment-1164249 Share on other sites More sharing options...
trq Posted January 24, 2011 Share Posted January 24, 2011 I really wouldn't recommend the idea. GIT (or any really) is tried and true and will always offer allot more features, will be compatible with other systems / tools and be allot more stable than any half baked solution. Link to comment https://forums.phpfreaks.com/topic/225154-cvs/#findComment-1164255 Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.