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
