Guten Tag Peter Flynn,
am Montag, 5. März 2012 um 20:29 schrieben Sie:
> Is there a command that will force the server to accept a file
> that has been modified locally, or should I just wipe the whole repo and
> start afresh?
As already said, checkout your current repo to a new directory, copy
the files you want to update over the working copy and commit the
changes.
> Assuming I can solve that one, I then need to add the other user
> machines' files. All the major components of the project will already be
> identical, so they can be checked out from the repository, but many
> smaller files, mostly reference and historical material, will be
> different on each user machine, but the most recent one is what I need
> (all the machines run ntp, so I am assuming I can trust the timestamps).
> None of these are critical, but it would be nice to have them added and
> checked in only if their timestamp is more recent than any copy already
> in the repository. Can this be done using svn, or do I need to do it
> manually (well, maybe with rsync) and then checkin the result?
Do as the first time, checkout the repo, with the already updated
contents now, and copy the local files over the working copy. The
easiest is to copy all files regardless of timestamps or else and let
svn using svn status or svn commit see itself what was changed and
commit the changes again as needed.
Consider that on this simple setup with all working copies presenting
the same directory structure and files, you can't have different file
contents of special files on each of your machines/users because each
user's commit would change the contents of the committed file for all
other users resulting in changes or even conflicts for the other
users, depending on the nature of the changes made. You may need to
separate user specific files in different directories, but this would
heavily depend on the nature of the file changes you are talking
about.
Mit freundlichen Grüßen,
Thorsten Schöning
--
Thorsten Schöning E-Mail:Thorsten.Schoening_at_AM-SoFT.de
AM-SoFT IT-Systeme http://www.AM-SoFT.de/
Telefon.............030-2 1001-310
Fax...............05151- 9468- 88
Mobil..............0178-8 9468- 04
AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hanover HRB 207 694 - Geschäftsführer: Andreas Muchow
Received on 2012-03-05 21:33:45 CET