[prev in list] [next in list] [prev in thread] [next in thread]
List: fossil-users
Subject: Re: [fossil-users] error
From: Mark Janssen <mpc.janssen () gmail ! com>
Date: 2011-03-24 21:29:38
Message-ID: AANLkTimOBF1EC8GhKm4cExDKMwas7=b2SdNkrr_fqvQP () mail ! gmail ! com
[Download RAW message or body]
On Thu, Mar 24, 2011 at 10: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
>
>
> 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
[Attachment #3 (text/html)]
<br><br><div class="gmail_quote">On Thu, Mar 24, 2011 at 10:14 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 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><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>_______________________________________________<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><div>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:</div><div>1) After copying over the svn checkout, \
does fossil status show you what you expect?</div> <div>2) Try "<span \
class="Apple-style-span" style="font-family: arial, sans-serif; line-height: 15px; \
"><em style="font-weight: bold; font-style: normal; ">fossil</em> setting <em \
style="font-weight: bold; font-style: normal; ">mtime</em>-<em style="font-weight: \
bold; font-style: normal; ">changes</em> on" and then do a commit and see if the \
same error occurs.</span></div> <div><span class="Apple-style-span" \
style="font-family: arial, sans-serif; line-height: 15px; \
"><br></span></div><div><span class="Apple-style-span" style="font-family: arial, \
sans-serif; line-height: 15px; ">Regards,</span></div> <div><span \
class="Apple-style-span" style="font-family: arial, sans-serif; line-height: 15px; \
">Mark</span></div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic