Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

SVN show files in working directory which are out of date

I am playing around with SVN trying to get a better feel for how it works. I added some files to my repository and checked them out into 2 separate working directories. For working directory 1 I am using my SQL client software (Aqua Data Studio) to modify the file and working directory 2 I am just using Windows Explorer with TortoiseSVN.

My question is, does SVN or the clients built on top of it, never show when a file in your working copy is out of date? If I make a change in working directory 1 and commit I would expect to see working directory 2 notify me that my working copy is out of date with the repository. Is this ever the case? Is there any way to tell which files in my working directories are out of date or do I just need to be careful to always update prior to making a change to a file?

like image 971
Jay Avatar asked Oct 12 '10 19:10

Jay


People also ask

How do I find previous versions in svn?

By far the easiest way to revert the changes from one or more revisions, is to use the revision log dialog. Select the file or folder in which you need to revert the changes. If you want to revert all changes, this should be the top level folder. Select TortoiseSVN → Show Log to display a list of revisions.

Does svn move preserve history?

If you right-drag the folder and use "SVN move versioned item(s) here", then you keep the history. Even the history of the files within the folder. But, the log dialog won't show the history unless you uncheck the box "Stop on copy/rename".

How do I view local changes in svn?

To get an overview of your changes, use the svn status command. You may use svn status more than any other Subversion command. If you run svn status at the top of your working copy with no arguments, it detects all file and tree changes you've made.

Is out of date svn commit failed?

An svn commit of the file will fail with an “out-of-date” error. The file should be updated first; an svn update command will attempt to merge the public changes with the local changes. If Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict.


2 Answers

Try svn status --show-updates

[EDIT] I didn't notice at first that you were using Windows, but this command should work for others running OSX or Linux

like image 106
shiftycow Avatar answered Oct 01 '22 17:10

shiftycow


With TortoiseSVN, use the "Check for Modifications" command, then hit the "Check Repository" button.

like image 34
Ben Voigt Avatar answered Oct 01 '22 17:10

Ben Voigt