[prev in list] [next in list] [prev in thread] [next in thread]
List: fossil-users
Subject: Re: [fossil-users] error
From: Richard Hipp <drh () sqlite ! org>
Date: 2011-03-25 1:27:57
Message-ID: AANLkTine0umuahTqzzhHWgvsa3Dng_-abEvSZLkRQWsA () mail ! gmail ! com
[Download RAW message or body]
On Thu, Mar 24, 2011 at 9:23 PM, Federico Ramallo <framallo@gmail.com>wrote:
> 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.
>
Can you send me the output of the following queries against the repository
database:
SELECT * FROM shun;
SELECT uuid FROM blob WHERE rid IN phantom;
If either of these queries given non-empty outputs, then I'm also wondering
if the sha1sum for any of your input files (before you added the extra blank
lines) match any of the output SHA1 hashes.
> 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 <drh@sqlite.org>
>
>>
>>
>> On Thu, Mar 24, 2011 at 5:14 PM, Federico Ramallo <framallo@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://framallo@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
>> drh@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
>
>
--
D. Richard Hipp
drh@sqlite.org
[Attachment #3 (text/html)]
<br><br><div class="gmail_quote">On Thu, Mar 24, 2011 at 9:23 PM, Federico Ramallo \
<span dir="ltr"><<a \
href="mailto:framallo@gmail.com">framallo@gmail.com</a>></span> \
wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px \
#ccc solid;padding-left:1ex;">
Hi,<div><br></div><div>I've been struggling with this for a while. </div><div>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.</div>
<div><br></div><div>So I edited each file and added a blank line at the bottom of the \
file.</div></blockquote><div><br>Can you send me the output of the following queries \
against the repository database:<br><br> SELECT * FROM shun;<br>
SELECT uuid FROM blob WHERE rid IN phantom;<br><br>If either of these queries \
given non-empty outputs, then I'm also wondering if the sha1sum for any of your \
input files (before you added the extra blank lines) match any of the output SHA1 \
hashes. <br>
<br> </div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; \
border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"><div>That allowed me \
to commit :O awesome! ja</div><div><br></div><div>Anyway I could try to reproduce the \
error if you think it makes sense to test it out</div>
<div><br></div><div>Regards,</div><div>Federico</div><div><div></div><div \
class="h5"><div><br></div><div><div class="gmail_quote">2011/3/24 Richard Hipp <span \
dir="ltr"><<a href="mailto:drh@sqlite.org" \
target="_blank">drh@sqlite.org</a>></span><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex"> <br><br><div class="gmail_quote"><div>On Thu, Mar 24, 2011 \
at 5:14 PM, Federico Ramallo <span dir="ltr"><<a href="mailto:framallo@gmail.com" \
target="_blank">framallo@gmail.com</a>></span> wrote:<br><blockquote \
class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc \
solid;padding-left:1ex">
Hi all,<div><br></div><div>I have an error that doesn't allow me to commit. Do \
you have any ideas what could be wrong? </div><div><br></div><div><div>$ f commit \
--branch svn_R2 -f -m 'added svn branch R2' </div>
<div>Autosync: <a href="http://framallo" target="_blank">http://framallo</a>@<a \
href="http://tangosource.com/fossil/dibspace" \
target="_blank">tangosource.com/fossil/dibspace</a></div><div> Bytes \
Cards Artifacts Deltas</div>
<div>
Sent: 1023 20 0 0</div><div>Received: \
2102 45 0 0</div><div>Total network traffic: 785 bytes \
sent, 547 bytes received</div><div>New_Version: \
5a0df73bd101295e8906f31d84a61315cc00c0d4</div>
<div>ERROR: [app/controllers/users_controller.rb] is 14272 bytes on disk but 0 in the \
repository</div><div>ERROR: [app/models/appointment.rb] is 13468 bytes on disk but 0 \
in the repository</div><div>ERROR: [app/models/invoice.rb] is 9318 bytes on disk but \
0 in the repository</div>
<div>ERROR: [app/views/timeline_events/_joined.html.haml] is 436 bytes on disk but 0 \
in the repository</div><div>ERROR: [app/controllers/sub_categories_controller.rb] is \
3490 bytes on disk but 0 in the repository</div><div>
ERROR: [app/views/categories/index.html.haml] is 356 bytes on disk but 0 in the \
repository</div><div>ERROR: [app/views/funding_transactions/show.html.haml] is 1011 \
bytes on disk but 0 in the repository</div><div>ERROR: \
[db/migrate/20110112205254_create_funding_transactions.rb] is 853 bytes on disk but 0 \
in the repository</div>
<div>fossil: working checkout does not match what would have ended up in the \
repository: 964fb36de7aedcd36b2c5277ffeb4aa2 versus \
b97ef7e867c04f9310b4200ed2c494a6</div></div></blockquote></div><div><br>This is one \
of the many safety checks that Fossil has built-in to help prevent repository \
corruption. See <a href="http://www.fossil-scm.org/fossil/doc/trunk/www/selfcheck.wiki" \
target="_blank">http://www.fossil-scm.org/fossil/doc/trunk/www/selfcheck.wiki</a> for \
more information.<br>
<br>I don't know what is causing the problem. Maybe the file timestamps are \
getting messed up when you do the "cp". Try running:<br><br> fossil \
status --sha1sum<br><br>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.<br>
<br>Other things to try:<br><br> fossil sql<br><br>Then at the SQL prompt \
enter:<br><br> PRAGMA integrity_check;<br><br>If that looks OK, try<br><br> \
fossil rebuild<br><br><br> </div><blockquote class="gmail_quote" style="margin:0pt \
0pt 0pt 0.8ex;border-left:1px solid rgb(204, 204, 204);padding-left:1ex">
<div>
<div><br></div><div><br></div><div>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)</div> <div>Anyway I'm trying to update our repo with one big \
commit with the all diff and see how it goes.</div><div><br></div><div>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.</div>
<div>I know is dirty and all the history is lost.</div><div>The thing is that the \
files are not 0 on that commit. I tried a fee commits up and I have the same error \
</div><div><br></div><div>Thanks!</div><div>Federico Ramallo</div>
<br></div><div>_______________________________________________<br>
fossil-users mailing list<br>
<a href="mailto:fossil-users@lists.fossil-scm.org" \
target="_blank">fossil-users@lists.fossil-scm.org</a><br> <a \
href="http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users" \
target="_blank">http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users</a><br>
<br></div></blockquote></div><font color="#888888"><br><br clear="all"><br>-- <br>D. \
Richard Hipp<br><a href="mailto:drh@sqlite.org" \
target="_blank">drh@sqlite.org</a><br> \
</font><br>_______________________________________________<br> fossil-users mailing \
list<br> <a href="mailto:fossil-users@lists.fossil-scm.org" \
target="_blank">fossil-users@lists.fossil-scm.org</a><br> <a \
href="http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users" \
target="_blank">http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users</a><br>
<br></blockquote></div><br></div>
</div></div><br>_______________________________________________<br>
fossil-users mailing list<br>
<a href="mailto:fossil-users@lists.fossil-scm.org">fossil-users@lists.fossil-scm.org</a><br>
<a href="http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users" \
target="_blank">http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users</a><br>
<br></blockquote></div><br><br clear="all"><br>-- <br>D. Richard Hipp<br><a \
href="mailto:drh@sqlite.org" target="_blank">drh@sqlite.org</a><br>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic