A fossil user accidentally created a file where he intended to create a directory. After correcting his mistake he was completely unable to commit. To repair this I moved his changes to a branch and recreated them correctly. I think fossil should handle this by disallowing a file to become a directory in a single commit or recognizing the scenario and allow the commit.
fossil init blah.fossil # project-id: fe98cef5de1d274f3a0a70a31663baaccf4d4956 # server-id: aba72e61424872cf0dfe28fdaed8cd590005ef57 # admin-user: mrwellan (initial password is "569c70") fossil open blah.fossil echo blah > blah fossil add blah # ADDED blah fossil commit -m blah # New_Version: 3d7f335e8d87e6bf0b5e754ee96259f5d473da2d fossil rm blah # DELETED blah rm blah mkdir blah echo blah > blah/blah fossil add blah/blah # ADDED blah/blah fossil status # repository: /tmp/mrwellan/delme/blah/blah.fossil # local-root: /tmp/mrwellan/delme/blah/ # checkout: 3d7f335e8d87e6bf0b5e754ee96259f5d473da2d 2014-07-28 23:20:48 UTC # parent: 77bc77b749c988b84e456bf651fe25ff764e9ad2 2014-07-28 23:20:07 UTC # tags: trunk # comment: blah (user: mrwellan) # DELETED blah # ADDED blah/blah fossil commit -m blah/blah # fossil: not an ordinary file: /tmp/mrwellan/delme/blah/blah # fossil: abort due to prior errors fossil commit -m blah -force # fossil: not an ordinary file: /tmp/mrwellan/delme/blah/blah # fossil: abort due to prior errors -- Matt -=- 90% of the nations wealth is held by 2% of the people. Bummer to be in the majority...
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
