SVN log not showing all the revisions made to a file

Question

I've started using SVN before a few weeks. I am facing a weird problem right now. We have a file, which was added by me to the repository. Another developer checked it out yesterday, made some modifications to it, and comitted it to the repository. Today, I made some modifications to that file and comitted it to the repository. But it didn't ask me to merge the changes when I comitted that file, so now I only have the version which I had modified, and the changes done by the other developer are not even showing up in the log.

What am I missing here? How should I go about merging both the changes? We are using TortoiseSVN as a client.

EDIT: All other developers are able to see the log entry in their SVN clients!! So, it seems that the commit was properly done.

Answer 1

We had this same thing happen just now. Everyone else sees the latest revision, except the person who committed it. Repairing his svn directory didn't help... Show All didn't help....

Turns out that when you issue the Show Log command, you have 3 option boxes:

• Show Only Affected Paths
• Stop on Copy/Rename
• Include Merged Versions

When he selected the Include Merged Versions box, TortoiseSVN retrieved pretty much the same set of revisions again in the Show Log, but this time included the latest revision! Unchecking the box didn't remove the latest version.

My theory is that Tortoise caches the SVN info locally, and uses that instead of reaching across the net. Changing a major option forced it to re-read the SVN log history.

Answer 2

Right click on desktop, You will see tortoiseSVN, click on tortoiseSVN->Settings. Go to the Saved data and clear the log mentioned into picture. Please let me know if you have any additional questions.