On Thu, Mar 24, 2011 at 10:14 PM, Federico Ramallo <frama...@gmail.com>wrote:
> Hi all, > > I have an error that doesn't allow me to commit. Do you have any ideas what > could be wrong? > > $ f commit --branch svn_R2 -f -m 'added svn branch R2' > Autosync: http://frama...@tangosource.com/fossil/dibspace > Bytes Cards Artifacts Deltas > Sent: 1023 20 0 0 > Received: 2102 45 0 0 > Total network traffic: 785 bytes sent, 547 bytes received > New_Version: 5a0df73bd101295e8906f31d84a61315cc00c0d4 > ERROR: [app/controllers/users_controller.rb] is 14272 bytes on disk but 0 > in the repository > ERROR: [app/models/appointment.rb] is 13468 bytes on disk but 0 in the > repository > ERROR: [app/models/invoice.rb] is 9318 bytes on disk but 0 in the > repository > ERROR: [app/views/timeline_events/_joined.html.haml] is 436 bytes on disk > but 0 in the repository > ERROR: [app/controllers/sub_categories_controller.rb] is 3490 bytes on disk > but 0 in the repository > ERROR: [app/views/categories/index.html.haml] is 356 bytes on disk but 0 in > the repository > ERROR: [app/views/funding_transactions/show.html.haml] is 1011 bytes on > disk but 0 in the repository > ERROR: [db/migrate/20110112205254_create_funding_transactions.rb] is 853 > bytes on disk but 0 in the repository > fossil: working checkout does not match what would have ended up in the > repository: 964fb36de7aedcd36b2c5277ffeb4aa2 versus > b97ef7e867c04f9310b4200ed2c494a6 > > > Basically the repo was on svn, and I imported it to fossil. But the issue > is that we started working on trunk, and one svn branch was more updated > (crazy) > Anyway I'm trying to update our repo with one big commit with the all diff > and see how it goes. > > So I checked out one of the first commits we did in fossil, and cp over the > svn checkout that I have on another folder. > I know is dirty and all the history is lost. > The thing is that the files are not 0 on that commit. I tried a fee commits > up and I have the same error > > Thanks! > Federico Ramallo > > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > Depending on how exactly you copy over the files and how fossil uses mtime for files, this could be an issue with file timestamps. A couple of things to try would be: 1) After copying over the svn checkout, does fossil status show you what you expect? 2) Try "*fossil* setting *mtime*-*changes* on" and then do a commit and see if the same error occurs. Regards, Mark
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
