Tell me more ×
Programmers Stack Exchange is a question and answer site for professional programmers interested in conceptual questions about software development. It's 100% free, no registration required.
up vote 1 down vote favorite

That probably sounds confusing. Here's my situation: I have a software project I'd like to version control with Subversion. The project files are on a network share which is modified by several users. I'd like to version control the directory with caveat that many of the users are not going to be using a SVN client when they add, modify, move, and rename files. I'll be doing all the version control myself along with one or two other users. When I commit the changes with an SVN client I'd assume that all changes made to file, all deletions, renames, etc are intentional.

So how do I detect these changes if as user made them without using a client like TortoiseSVN? Can anyone recommend a client that could determine possible renames, deletions, and moved files? I want a way to keep track of/find any changes so I can commit them with ease, or relative ease. Thanks!

share|improve this question
Let me see if I have this right. You will be maintaining the "master copy" so to speak, and you want to use SVN. Issuing being, no one else will be using it. So you want a way to keep track of/find any changes so you can check them in with ease? – Tyanna Feb 18 '11 at 15:05
I would perhaps rephrase this to "what is the best version control client" as Subversion for this role sounds a bit like using a sledgehammer to unscrew a nut. – glenatron Feb 18 '11 at 15:27
@Tyanna That's correct. I want a way to keep track of/find any changes so I can commit them with ease, or relative ease. – user17680 Feb 18 '11 at 17:46

2 Answers

up vote 1 down vote

I'm going to have to suggest Beyond Compare. It's a great piece of software that let's you easily compare folders, sub-directory structure and files. It will show you difference between everything, and for files you can move text from one file to another with ease.

I was introduced to it a few years ago by a co-worker and it's really the best compare tool I've used.

Basically, you can keep your master copy in a folder with SVN, and the others can do their worst, and you can use that tool to compare what has changed and check it in.

Hope that helps. :)

share|improve this answer
up vote 0 down vote

I think that you missed the tool for your problem. Svn works under the assuption that people commint modificacions/additions/deletions etc, so not working with a client creates trouble.

My guess will be, check this out UNISON

Here is an extraction:

Unison is a file-synchronization tool for Unix and Windows. It allows two replicas of a collection of files and directories to be stored on different hosts (or different disks on the same host), modified separately, and then brought up to date by propagating the changes in each replica to the other.

share|improve this answer
Unison sounds great but I do want to use a VCS. Although there will be users that won't be modifying files with a client, there will be other users that will be making modifications the proper way with their own working copies. – user17680 Feb 18 '11 at 17:55

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.