Re: Moving from multiple scp to using svn

On 2012-02-29 07:32:26 PST, Alexander Mueller <XelaRellum> wrote:

> The multiple repository setup will not work out of the box (there are
> tools like svk that sit on top of svn for that or even better GIT).

I may have phrased that poorly. I only want ONE repository.

> My guess would rather be: have one repository on your svn server and
> have working copies on all machines. 

That's exactly what I want.

> If you change a file on machine X
> you commit the change. The other machine get the change with an update.

That's exactly what I want.

But how do I start when I *already* have multiple copies on the separate
client machines?

I already created a repository on a server, and added files from one of
the clients (weeks ago).

But some of the files on that client have been modified locally and need
to be pushed to the server again. I can't see how to do that.

Then...how do I "add" the files from the other clients, when
a) some of the files will already be identical (to ignore),
b) some will be older (obsolete) copies (to ignore), and
c) some will be newer (working) copies (to overwrite the server)?

///Peter

------------------------------------------------------
http://rapidsvn.tigris.org/ds/viewMessage.do?dsForumId=671&dsMessageId=2930740

To unsubscribe from this discussion, e-mail: [[email protected]].