Dave, Have you performed this test with windows exceptions enabled? It is possible that the direct write to the log file I have added after Phoenix has updated is causing an undisplayed exception. This would leave you in a situation where the system update has been performed but the active manifest has not been written to resulting in exactly what you see...2 grey boxes appearing indicating that that the update is being performed but then the original Phoenix being executed after a restart.
Bob -----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of Lluís Batlle i Rossell Sent: 03 July 2012 13:49 To: Fossil ML Subject: [fossil-users] Merging with renames (new directories) Hello, running a "fossil merge mybranch" fails to create some files, if the merge includes renames to a directory non existant in the working copy. Creating those directories makes the merge work. I think that the handling of renames in the 'merge' operation does not handle creating directories for those renames. The output: ... UPDATE tools/tool1/src/CMakeLists.txt RENAME tools/tool1/src/lv/CMakeLists.txt -> tools/tool2/src/lv/CMakeLists.txt /home/llbatlle/3rd/fossil/fossil: cannot open "/home/llbatlle/a/repo/tools/tool2/src/lv/CMakeLists.txt" for writing Stracing, it shows it's a open(...,O_CREAT,...) call failing with ENOENT. Tested with fossil trunk. Regards, Lluís. _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users _________________________________________________________________ This email has been scanned for all viruses by Claranet Mail Scanner, powered by MessageLabs. For more information on a proactive email security service working around the clock, around the globe, visit http://www.uk.clara.net _________________________________________________________________ ________________________________________________________________________ DISCLAIMER: Information contained in this email or any attachment may be of a confidential nature which should not be disclosed to, copied or used by anyone other than the addressee. It may also be legally privileged. If you receive this email in error, please delete the email from your computer and notify the sender immediately by return E-mail. Security Warning: Please note that this email has been created in the knowledge that Internet email is not a 100% secure communications medium. Virus Warning: _________________________________________________________________ This email has been scanned for all viruses by Claranet Mail Scanner, powered by MessageLabs. For more information on a proactive email security service working around the clock, around the globe, visit http://www.uk.clara.net _________________________________________________________________ _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
