Jump to content

Recommended Posts

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
Share on other sites

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
Share on other sites

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
Share on other sites

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
Share on other sites

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
Share on other sites

This thread is more than a year old. Please don't revive it unless you have something important to add.

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Restore formatting

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

×
×
  • Create New...

Important Information

We have placed cookies on your device to help make this website better. You can adjust your cookie settings, otherwise we'll assume you're okay to continue.