Re: [fossil-users] NOT_A_FILE problem
On 05/06/15 13:08, jim Schimpf wrote: [---] EDITED Docs/HayJam.pdf NOT_A_FILE Docs/images/Detector.graffle EDITED Docs/images/Detector.png So I then did a fossil rm of this file and did an OS rm and removed if from the directory. put it back in the directory and fossil added it to the repository again. Trying commit again I got the same problem. The status shows it’s added as a directory so I don’t see why this failed I've always thought of the changes within a commit not to be seen as an ordered journal (i.e. first do this, and then do that), but rather that it should be seen as all events occurring at the same time (or in an undefined order). I always make sure there aren't any contradictions in a commit (i.e. remove file X, and X is also a directory in the same commit). I assume that if you commit between removing the file, and then adding the directory, that it'll work (I'm pretty sure I have done that in the past?). Did you try that? -- Kind Regards, Jan ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] NOT_A_FILE problem
Thank you that worked. So if I have one of these files turned into directory or vice-versa events. The solution is to remove the offending item. (fossil rm..) then commit that, add it back in and then commit again. Makes sense and your explanation is the mechanism of what is going on. —jim schimpf ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] NOT_A_FILE problem
Hi, This is on OS X so bear with me. I have repository and in there is an OmmnuGraffle image (like Visio). Originally it was a single file but then I added a png image to the picture. On OS X it still looks like a single file but now it becomes a directory. When I did this and tried to commit I got: not an ordinary file: /Users/jschimpf/Public/HayJam/Docs/images/Detector.graffle abort due to prior errors Doing a status I got: 504 HayJam fossil status repository: /Users/jschimpf/Public/HayJam/../FOSSIL/HayJam.fossil local-root: /Users/jschimpf/Public/HayJam/ config-db:/Users/jim/.fossil checkout: d7568dfc3e5510b1f89c75ffd233329cba29ad76 2015-06-05 08:44:01 UTC parent: 6f67a2bb3b8313f70d044b3b2eaf2cd74f5fedfb 2015-06-05 07:25:10 UTC tags: trunk comment: Update sensor schematic with values (user: jim) EDITED Docs/HayJam.pdf NOT_A_FILE Docs/images/Detector.graffle EDITED Docs/images/Detector.png So I then did a fossil rm of this file and did an OS rm and removed if from the directory. put it back in the directory and fossil added it to the repository again. Trying commit again I got the same problem. The status shows it’s added as a directory so I don’t see why this failed fossil status EDITED ../HayJam.pdf DELETEDDetector.graffle ADDED Detector.graffle/data.plist ADDED Detector.graffle/image1.png EDITED Detector.png Any suggestions what to try: 1) Delete it, commit then re-add with new name 2) Delete it,commit then re-add with same name Oh yes: This is fossil version 1.27 [13ad130920] 2013-09-11 11:43:49 UTC Thanks very much for the help. —jim schimpf ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] NOT_A_FILE problem
On 6/5/2015 7:30 AM, Jan Danielsson wrote: I always make sure there aren't any contradictions in a commit (i.e. remove file X, and X is also a directory in the same commit). Perhaps off-topic, but I see no reason why you should have to worry about this particular case. Fossil does not track directories, only files. The name of a file includes its full path, but you could also have used _ or some other such character to arrange your files in a hierarchy, and Fossil wouldn't much care. There's no problem deleting a file called hello and creating one called hello_world, so likewise there's no problem deleting a file called hello whilst creating a file called hello/world. -- Andy Goth | andrew.m.goth/at/gmail/dot/com signature.asc Description: OpenPGP digital signature ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users