How to compare local copy of a file with latest one in Subversion using Tortoisesvn? I have all my files committed but there seems to be a difference somewhere and I am trying to find it.
views:
30answers:
4
A:
The option you're searching is called "Diff".
This feature shows you both versions of the same file (local copy and latest in repository), highlighting any difference between them.
Vivien Barousse
2010-08-30 16:40:41
I see only "Diff with previous version" and it doesn't pick the latest version.
Tony_Henrich
2010-08-30 17:07:15
Yes, it is this option. This option actually shows differences between your code and the last version you checked out in your working directory, before starting to work on your file.If you want to see the latest version from the repository, you first need to update your file, then use "Diff with previous version".
Vivien Barousse
2010-08-30 17:14:26
I did an update and a commit. The diff shows a line with a line thru it with old code. It doesn't show what the new code is. The repo-browser shows the correct line but it's not a side by side comparison. I just want to do a compare like any compare tool. One file is my file and the other is svn's. If another compare file can do it, that would be great.
Tony_Henrich
2010-08-30 17:29:53
A:
You right-click on the file you want to compare, expand TortoiseSVN and choose Diff.
If the file you have locally was edited since the last svn update you performed, it will have a red exclamation mark watermark on it's icon, if it doesn't then maybe you need to run svn update again and check the differences again.
Nico
2010-08-30 16:43:43
Then why don't you just compare? if there's no difference then both proyects should be the same as long as the whole is in subversion, and then you should start looking at other things like how the computers are set-up (what browser is installed in each one, what devenvs, etc.)You could use WinMerge[ http://winmerge.org ] to run the diffs, it automatically runs when you compare files with tsvn
Nico
2010-08-30 17:49:15
A:
Right click on the checked out folder and do "check for modifications" from the TortoiseSVN menu - this shows you all the files that have not yet been committed.
If you are paranoid that there are differences when someone else checks out the code you could just do a 2nd check out to some other folder and use a tool like kdiff3 to compare the two.
Adam Butler
2010-08-30 16:56:30
All files have been committed but I need to do a diff regardless if svn thinks everything is committed.
Tony_Henrich
2010-08-30 17:05:40
If they are all committed they should be identical - why do you think they are not?
Adam Butler
2010-08-30 17:13:45
Because the app behaves differently with another developer. I need to do a sanity check. No software is perfect.
Tony_Henrich
2010-08-30 17:15:00
If you are paranoid that there are differences when someone else checks out the code you could just do a 2nd check out to some other folder and use a tool like kdiff3 to compare the two.
Adam Butler
2010-08-30 17:26:28
Assuming you have updated your file with the latest changes from the repository, I would attempt to check out the branch again elsewhere, overwrite the file in question with your changes and use 'Diff' at this point. Perhaps working with a fresh branch that only includes the one changed file will allow Tortoise to recognize there are changes.
Bernard
2010-08-30 17:29:34