Re: [fossil-users] how to deal with files which became directories?
On Jan 13, 2014, at 15:21, Ron Wilson ronw.m...@gmail.com wrote: On Mon, Jan 13, 2014 at 3:18 PM, Christian Pekeler christ...@pekeler.orgwrote: I have a Numbers document in Fossil. It used to be just a file, now it's a folder. How can I commit this change to Fossil? fossil rm Documents/daycare_stats.numbers DELETED Documents/daycare_stats.numbers fossil add Documents/daycare_stats.numbers/* fossil commit -m upgraded Numbers doc ... not an ordinary file: /Users/pekeler/Projects/kdw/Documents/daycare_stats.numbers abort due to prior errors I think you have to commit the file deletion before doing the add. Thanks. That did the trick. Not ideal, though, because the history of the original file isn't associated with the files in the new folder. Christian ___ 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] how to deal with files which became directories?
On Mon, Jan 13, 2014 at 10:51:18PM -0700, Christian Pekeler wrote: On Jan 13, 2014, at 15:21, Ron Wilson ronw.m...@gmail.com wrote: On Mon, Jan 13, 2014 at 3:18 PM, Christian Pekeler christ...@pekeler.orgwrote: I have a Numbers document in Fossil. It used to be just a file, now it's a folder. How can I commit this change to Fossil? fossil rm Documents/daycare_stats.numbers DELETED Documents/daycare_stats.numbers fossil add Documents/daycare_stats.numbers/* fossil commit -m upgraded Numbers doc ... not an ordinary file: /Users/pekeler/Projects/kdw/Documents/daycare_stats.numbers abort due to prior errors I think you have to commit the file deletion before doing the add. Thanks. That did the trick. Not ideal, though, because the history of the original file isn't associated with the files in the new folder. Christian May be you could have rename the file first and commit. Then create the folder and move the file in it.. So in that case, you would keep the history of the file. e.g.: - fossil mv origfile origfile.copy fossil commit ... mkdir origfile fossil mv origfile.copy origfile/new_origfile_name mv origfile.copy origfile/new_origfile_name ... (add you other files) fossil commit ... -- Martin G. ___ 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] how to deal with files which became directories?
On Tue, Jan 14, 2014 at 01:02:36AM -0500, Martin Gagnon wrote: On Mon, Jan 13, 2014 at 10:51:18PM -0700, Christian Pekeler wrote: On Jan 13, 2014, at 15:21, Ron Wilson ronw.m...@gmail.com wrote: On Mon, Jan 13, 2014 at 3:18 PM, Christian Pekeler christ...@pekeler.orgwrote: I have a Numbers document in Fossil. It used to be just a file, now it's a folder. How can I commit this change to Fossil? fossil rm Documents/daycare_stats.numbers DELETED Documents/daycare_stats.numbers fossil add Documents/daycare_stats.numbers/* fossil commit -m upgraded Numbers doc ... not an ordinary file: /Users/pekeler/Projects/kdw/Documents/daycare_stats.numbers abort due to prior errors I think you have to commit the file deletion before doing the add. Thanks. That did the trick. Not ideal, though, because the history of the original file isn't associated with the files in the new folder. Christian May be you could have rename the file first and commit. Then create the folder and move the file in it.. So in that case, you would keep the history of the file. e.g.: - fossil mv origfile origfile.copy fossil commit ... mkdir origfile fossil mv origfile.copy origfile/new_origfile_name mv origfile.copy origfile/new_origfile_name ... (add you other files) fossil commit ... Sorry, forget this. I remember now that fossil mv will not make the history of the old filename follow the new filename. So my more complicated way would give the same result as the way Ron Wilson describe. Note: This history is still on the repository, but not just under the new filename.. -- Martin G. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
