Hi, I've been struggling with this for a while. I tried changing settings, creating diffs and patching. Until eventually I modified one file manually and worked, but I had to do it for a lot of files.
So I edited each file and added a blank line at the bottom of the file. That allowed me to commit :O awesome! ja Anyway I could try to reproduce the error if you think it makes sense to test it out Regards, Federico 2011/3/24 Richard Hipp <d...@sqlite.org> > > > On Thu, Mar 24, 2011 at 5: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 >> > > This is one of the many safety checks that Fossil has built-in to help > prevent repository corruption. See > http://www.fossil-scm.org/fossil/doc/trunk/www/selfcheck.wiki for more > information. > > I don't know what is causing the problem. Maybe the file timestamps are > getting messed up when you do the "cp". Try running: > > fossil status --sha1sum > > The --sha1sum option to status will cause Fossil to verify all files using > SHA1 checksums rather than just looking at the mtime and file size. > > Other things to try: > > fossil sql > > Then at the SQL prompt enter: > > PRAGMA integrity_check; > > If that looks OK, try > > fossil rebuild > > > > >> >> >> 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 >> >> > > > -- > D. Richard Hipp > d...@sqlite.org > > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > >
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
