Seeking test on SmartSVN 6.0.4
Brought to you by:
canajun2eh,
yalnifj
Menu
▾
▴
I upgraded SmartSVN (on Mac) to 6.0.4
Then I updated PGV from 6049 to 6053.
includes/classes/class_stats.php, which I have never edited, became a conflict.
Three-way-view was _full_ of differences on both sides.
Some unchanged code was shown as an addition on one side or the other.
"Revert" is of course the simple fix, but I wonder whether anyone else has a library in 6049 or earlier who could see whether this is reproducible.
thanks
Wes
I had no such conflict in updating this file. Perhaps yours was corrupted. You can DL a fresh copy of the file to your SVN by deleting, then updating again to 6053. If you wish to compare the file, browse the SVN to that file and look at the DIFF changes at each SVN level.
http://phpgedview.svn.sourceforge.net/viewvc/phpgedview/trunk/phpGedView/includes/classes/class_stats.php?view=log
Recent changes at 6045, 6049, 6052
Stephen
Wes, also no problems with the 6049-6053 update here.
However, there are a LOT of changes within class_stats.php. There have also been many others over the last few weeks, as wooc has been extremely busy with tremendous improvements to the statistics features. Perhaps yours got out of synch at some point.
Who knows. After scanning through the three-way view, and seeing no reason for SmartSVN to detect a conflict, I just did a revert. But it was weird. Maybe there's a .svn flag that made it seem I had modified it.
SOLVED:
I activated a feature in my hosting account, that _should_ have only affected stuff outside of the PGV directories. But the provider's script changed permissions on some PHP files, then tried to relocate the entire account to a different server. Only they created the new account, pointed the DNS to it and then quit, leaving it empty and owned by root.
After they restored the files (more than 48 hours--grr!) I had version A of the file while .svn thought I had version B (A < B) So when updating to C, SmartSVN made the reasonable assumption that the differences between A and B were edits I had done to B.