From: Tim L. <guy...@gm...> - 2011-12-05 16:16:51
|
On 5 Dec 2011, at 16:05, Brian Matherly wrote: > Paul, > > >> One anomaly I noticed is that some files seem to have lost >> their SVN "history" and their SVN properties. >> >> I haven't made a rigorous check -- and don't plan to -- >> but I happened to notice the three "user" files (src/gen/user.py, >> src/cli/user.py, and src/gui/user.py) all had lost their SVN >> record of what changes had previously been made. >> >> Likewise, none of the three now have either their svn:mime-type >> (of "text/plain") or their svn:keywords (of "Id"), which I added >> a month or so ago. > > > That's strange. It must be a result of the database upgrade. Feel > free to fix the broken properties. You might want to try making a > fresh checkout first. > > Regards, > > ~Brian > When I did the commit, most of the files were reported as 'Sending' or 'Adding', but a few were reported as 'Replacing': [Mon Dec 05 16:07:38]$ grep Replacing /Users/xxx/Desktop/temp.txt Replacing /Users/tim/gramps/trunk/src/DateHandler/_Date_zh.py Replacing /Users/tim/gramps/trunk/src/Filters/Rules/Person/ _IsRelatedWith.py Replacing /Users/tim/gramps/trunk/src/Filters/Rules/ _HasSourceBase.py Replacing /Users/tim/gramps/trunk/src/cli/user.py Replacing /Users/tim/gramps/trunk/src/data/templates/ browse_page.html Replacing /Users/tim/gramps/trunk/src/data/templates/ process_action.html Replacing /Users/tim/gramps/trunk/src/data/templates/ view_report.html Replacing /Users/tim/gramps/trunk/src/data/templates/ view_report_detail.html Replacing /Users/tim/gramps/trunk/src/data/templates/ view_tag.html Replacing /Users/tim/gramps/trunk/src/data/templates/ view_tag_detail.html Replacing /Users/tim/gramps/trunk/src/data/templates/ view_tags.html Replacing /Users/tim/gramps/trunk/src/gen/user.py Replacing /Users/tim/gramps/trunk/src/gui/user.py Replacing /Users/tim/gramps/trunk/src/gui/widgets/ basicentry.py Replacing /Users/tim/gramps/trunk/src/plugins/lib/ libmetadata.py Replacing /Users/tim/gramps/trunk/src/plugins/webstuff/css/ Web_Horizontal-Menus.css Replacing /Users/tim/gramps/trunk/src/plugins/webstuff/css/ Web_Vertical-Menus.css [Mon Dec 05 16:07:56]$ I have no idea why this should have been. I have checked a few of these files, and none of them appeared in the diff I did before the commit. I am not sure what I have done to these files, except for the Filters files, I don't think I have changed any of them. They seem to have come from the merge I did in 5 Nov. Not sure what else to look at. Replacing is difficult to find in the svn documentation, but it seems to mean something like it is scheduled for deletion, and then inserted (or something like that). Regard Tim. |