Re: [fossil-users] anomaly using [g]diff

2014-05-13 Thread Jan Nijtmans 
2014-05-13 3:34 GMT+02:00 Will Parsons varro@nodomain.invalid:
 repository:   /home/william/FOSSIL/recepsum.fossil
 local-root:   /home/william/mlc/recepsum-database/
 config-db:/home/william/.fossil

Your .fossil file contains information on which files are locally
changed. The vfile table rememberd rid's for each file which
is in the current checkout. Those rid's are searched in
the blob table in your recepsum.fossil database.

My guess is that you re-cloned recepsum.fossil and wrote
it over the original recepsum.fossil file. This can result in
chaned rid's, so the rid's in your .fossil file doesn't match
your recepsum.fossil any more. That could result in
exactly the symptoms you are seeing.

You can fix that with:
 fossil checkout f51f0cfb9eed704a0e92364e1e6ea5d6d97c2365 --keep

(The uuid is from the checkout line for your fossil stat)

Regards,
 Jan Nijtmans
___
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] anomaly using [g]diff

2014-05-13 Thread Will Parsons 
Jan Nijtmans wrote:
 Your .fossil file contains information on which files are locally
 changed. The vfile table rememberd rid's for each file which
 is in the current checkout. Those rid's are searched in
 the blob table in your recepsum.fossil database.

 My guess is that you re-cloned recepsum.fossil and wrote
 it over the original recepsum.fossil file. This can result in
 chaned rid's, so the rid's in your .fossil file doesn't match
 your recepsum.fossil any more. That could result in
 exactly the symptoms you are seeing.

 You can fix that with:
  fossil checkout f51f0cfb9eed704a0e92364e1e6ea5d6d97c2365 --keep

 (The uuid is from the checkout line for your fossil stat)

Thank you!  I think you're probably right about what happened.

-- 
Will

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] anomaly using [g]diff

2014-05-12 Thread Will Parsons 
I recently revisited a working directory that I hadn't visited
recently, so I wanted to review what the changes were, so here's what
I found:

-

anukis% fossil stat
repository:   /home/william/FOSSIL/recepsum.fossil
local-root:   /home/william/mlc/recepsum-database/
config-db:/home/william/.fossil
checkout: f51f0cfb9eed704a0e92364e1e6ea5d6d97c2365 2014-03-18 15:37:12 UTC
parent:   ed66965bda143b48c8ee0527cedac89ef339bfac 2014-03-16 20:28:57 UTC
child:6c1bc9c59efa741fa79ae6a9f78887e55ea6d675 2014-03-18 19:33:45 UTC
tags: trunk
comment:  Fix default registry values in file dialogs. (user: wbp)
EDITED database.rb
EDITED envelsum.rb
anukis% 
anukis% 
anukis% 
anukis% fossil dif
Index: database.rb
==
--- database.rb
+++ database.rb
@@ -1,164 +1,503 @@
 

-#  file_dialog.rb
+#  database.rb
+#
+#  This module defines the Database class for recepsum.
 #

**
long list of stuff snipped here, but what is being compared is *not*
the archived version of database.rb vs. the version in the working
directory, but two completely different files: file_dialog.rb vs.
database.rb.
**


Index: envelsum.rb
==
--- envelsum.rb
+++ envelsum.rb
@@ -1,26 +1,1793 @@
-C Fix\sregression\sadding\senvelope\sintroduced\sin\s[092129dc86].
-D 2014-03-09T20:31:19.865
-F GNUmakefile b79b737829e29381e9a0141e9780701f6e22c2a1
-F INSTALL ddf09deec2fa109ab08e0d57637933acb5e8c2a7
-F Makefile 218c25f5922393c154935b9a42f41896644b6179
-F NOTES 77c6eaba4bac281701b2a0f8507eccfc203d8c9c
-F README 68943f3aa7cba7ea4b015e7eaa8e742c90f14671
-F Rakefile 2bf7b0908dc79df5482caa8a5dda66ddcd32e8be
-F database.rb 9d9bf5d7d2cf9c9b7289555dca84495241c9fa2f
-F drop-old-data fc291f0e8b3fe8fd01246cb80506455dea2d3a8d x
-F enhanced_text.rb 4b0eadc8ca769899d8f003ab8d05683cbdd9e0b1
-F envelsum.rb 6dd5783be30ea8ff2546c6a2eeec2a19cd2865e3 x
-F erroricon.gif fc0d8233390a8309a045f921effb5524523600b5
-F file_dialog.rb 028ec56d0723b18188db8d5c5fa8bba89797d2fe
-F pmemboff f6d99dab1c077b5e15392d7ae2f453962eab1cfd x
-F print_dialog.rb 5c21f3390500c5f6a79562a35e2781c056cd7493
-F questionicon.gif 6f1fd934cfa702127fd78392921dad6e27ed4309
-F recepsum.lyx bd59f7f4d91bf3c1ee458cb1397191bf5caf3e0c
-F recepsum.rb 323763742eb03653f9fe6c38d25285a7e9d12725 x
-F show-statistics ae71b59b549fc81f5ecd635c00cef7c6825d7fcd x
-F totals-per-category 5278b8d232988486198591a907f0419510d97e46 x
-F totals-per-envelope 31848504d230ae3c51147f7b71bc3e2e48d4a994 x
-P 510dd8a09d9f35fa8c6f7fee6f772ae0b3c3c1fd
-R 6fbbca5a82f3b9661f7b812c6a4e41e7
-U wbp
-Z 48cc33b39b2439e0cf43f6fc6b2abbc9
+#!/usr/bin/env ruby
+
+#  envelsum.rb
+#

**
again, what is being compared is *not* the archived version of
envelsum.rb vs. the version in the working directory, but some log
file(?) vs. the current envelsum.rb.

(rest of the output [basically, the entire contents of envelsum.rb]
omitted for brevity.)
**

anukis% fossil version
This is fossil version 1.28 [3d49f04587] 2014-01-27 17:33:44 UTC

-

If I use fossil [g]diff on a single file, I don't get the bizarre
comparisons, but it looks like the files in question have not changed
(despite the output of fossil stat).

-- 
Will

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users