[fossil-users] Feature Request: Automatic vacuuming of .fslckout (or _FOSSIL_)

2016-05-10 Thread Christopher M. Fuhrman
Good Day,

I've noticed that the .fslckout file can grow exceptionally large,
especially for larger repositories such as pkgsrc[1].  So, I decided
to do a VACUUM on it to see how much space is for empty pages:

  [ cmf-macbookpro13-10:16 AM ]-pkgsrc $ ls -al .fslckout
  -rw-r--r--  1 cfuhrman  staff  37021696 May 10 06:29 .fslckout
  [ cmf-macbookpro13-10:17 AM ]-pkgsrc $ echo "vacuum;" | sqlite3 ./.fslckout
  [ cmf-macbookpro13-10:21 AM ]-pkgsrc $ ls -al .fslckout
  -rw-r--r--  1 cfuhrman  staff  20192256 May 10 10:21 .fslckout

If you notice, that's a 45% reduction in the size of this file which
is quite significant!  Would it be possible to add periodic vacuuming
of the .fslckout (or _FOSSIL_) file?

Cheers!
/Chris

Footnotes:
[1]  http://pkgsrc.sonnenberger.org

-- 
Christopher M. Fuhrman
cfuhr...@pobox.com



___
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] Semi-annual drumming-up-of-support for libfossil

2016-01-21 Thread Christopher M. Fuhrman

On Mon, 18 Jan 2016 at 5:24am, Stephan Beal wrote:

> On Mon, Jan 18, 2016 at 2:17 PM, Carlo Miron <ca...@miron.it> wrote:
>
> > Still using Emacs :-?
> >
>
> er yes, but i am adjusting to the right hand for the ctrl key :/. Or
> trying to.
>

Is your Caps-Lock key to the left of the 'A' key on your keyboard?  If so,
I've had good luck swapping the Caps-Lock key with the Control key so my
left pinky doesn't have to do gymnastics to hit Cntrl all the time.

Cheers!

-- 
Christopher M. Fuhrman
cfuhr...@pobox.com


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


[fossil-users] Patch: Document --quiet option in rebuild

2015-11-02 Thread Christopher M. Fuhrman
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Howdy,

Discovered that the rebuild command supported an undocumented option,
- --quiet.  Since 'fossil help' was, er, quiet about the quiet option, I've
created a patch that mentions it when doing a 'fossil help rebuild'.

Example output:

Usage: ./fossil rebuild ?REPOSITORY? ?OPTIONS?

Reconstruct the named repository database from the core
records.  Run this command after updating the fossil
executable in a way that changes the database schema.

Options:
  --analyze Run ANALYZE on the database after rebuilding
  --cluster Compute clusters for unclustered artifacts
  --compressStrive to make the database as small as possible
  --compress-only   Skip the rebuilding step. Do --compress only
  --deanalyze   Remove ANALYZE tables from the database
  --force   Force the rebuild to complete even if errors are seen
  --ifneededOnly do the rebuild if it would change the schema version
  --index   Always add in the full-text search index
  --noverifySkip the verification of changes to the BLOB table
  --noindex Always omit the full-text search index
  --pagesize N  Set the database pagesize to N. (512..65536 and power of 2)
  --quiet   Only show output if there are errors
  --randomize   Scan artifacts in a random order
  --stats   Show artifact statistics after rebuilding
  --vacuum  Run VACUUM on the database after rebuilding
  --wal Set Write-Ahead-Log journalling mode on the database

See also: deconstruct, reconstruct

I am attaching the following:

 1. A bundle file containing the patch (thanks for adding that feature
BTW!)
 2. An 'old school' diff/patch with the change in it.

Please let me know if you have any questions or concerns.

Cheers!

- -- 
Christopher M. Fuhrman
cfuhr...@pobox.com

-BEGIN PGP SIGNATURE-
Version: GnuPG/MacGPG2 v2.0
Comment: GPGTools - http://gpgtools.org

iQEcBAEBCAAGBQJWN6/eAAoJEJMBHfiIBijR0pwH/0tQumInHYvu9S1Vvb5H/4tc
AqrHdUn+nsGUd1no6gFfW3DS98bkfMxtNMhdtCV5TrGeVcXU9o4c8Op4UxQHOVE4
3qEqes7q1yTTLZH9w0puFnXx9kN3KJ8yPjs1+ck2dCWv6Jf7Yt86xFtDni1H2rb3
P3EzXBLVdNVQxvhmqsnNARR+SXa0p1shPUoxlouL+/zQOjkZyymszkdZJvYLlYC3
fohjQelmH8KB/FkJarj9H9dDf0wIeqLZjtfcwI0JYd+cDkcBXI1nznC/eHpX3gcc
XNzB1rsbmam/UUJHJIeyquB+D4lDOqbcMjalpphJJmmLWjAYgV3KrKsG8Lzj2x4=
=I5RP
-END PGP SIGNATURE-Index: src/rebuild.c
==
--- src/rebuild.c
+++ src/rebuild.c
@@ -533,10 +533,11 @@
 **   --ifneededOnly do the rebuild if it would change the schema 
version
 **   --index   Always add in the full-text search index
 **   --noverifySkip the verification of changes to the BLOB table
 **   --noindex Always omit the full-text search index
 **   --pagesize N  Set the database pagesize to N. (512..65536 and power 
of 2)
+**   --quiet   Only show output if there are errors
 **   --randomize   Scan artifacts in a random order
 **   --stats   Show artifact statistics after rebuilding
 **   --vacuum  Run VACUUM on the database after rebuilding
 **   --wal Set Write-Ahead-Log journalling mode on the database
 **



cmf-doc-quiet-rebuild.bundle
Description: Binary data
___
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] SHA1 and security

2015-10-29 Thread Christopher M. Fuhrman
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

On Wed, 28 Oct 2015 at 5:37pm, Eduard wrote:

> Hi,
>
> I wish to discuss the issues surrounding the use of SHA1 in Fossil and
> their consequences, as well as propose several possibilities to deal
> with them.
>



>
> As for the exact value of BetterHash, I would like to nominate
> BLAKE2b-512 [2]. It is faster than both MD5 and SHA1, it is based upon
> BLAKE which has received a lot of cryptanalytic attention during the
> SHA3 competition, and it retains a large security margin (the best
> (academic) attack to date is on a reduced version that does only 2.5
> rounds instead of 10, and even then only downgrades the security from
> 512 to 481 bits).

What kind of speed hit would using the BLAKE2b algorithm on 32-bit
machines such as i386, vax, or m68k?  Yes, there's the BLAKE2s
algorithm for 8-32 bit architectures but that produces different
hashes than BLAKE2b.  Is it even possible to use BLAKE2b on a 32-bit
CPU?

>
> Please let me know your thoughts on this matter.
>
> Best regards,
> Eduard
>
> [1] https://sites.google.com/site/itstheshappening/
> [2] https://blake2.net/
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>

- -- 
Christopher M. Fuhrman
cfuhr...@pobox.com

-BEGIN PGP SIGNATURE-
Version: GnuPG/MacGPG2 v2.0
Comment: GPGTools - http://gpgtools.org

iQEcBAEBCAAGBQJWMoDyAAoJEJMBHfiIBijRtEEH/iSc9bDaJR2HlJIWwFV6uIws
pwotLs9W6fwcZoLz++ofd+V03p3gJC5wrYWEEeBHGlnGUA9InUudKG8NGvHqOju3
nS+lFeHf2eDDGV8/oZQF8lmjm751+WRDSi5TB+fmhgVaKmdMTLQmymw1Il+MmfFI
1uqAV1GGg4A89x+ER9mMFBpRKpTyP5jFq/NhPYQzUyXyPeoSxTesafAWFTL89fCP
/ShpwsAUeUc8i9PDFDhRApT4grMwQ+R+c8VH5NNoTcMo47hXCuhjCALLNOSKhztw
FPOJm5xS7IykiFaF9Tx0+M365hMbcO/9iu9X5eqbhfjQ3VLd7gqL4ntLcpu5xgY=
=cXkl
-END PGP SIGNATURE-
___
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] Ignoring merge conflicts on a binary file

2015-07-28 Thread Christopher M. Fuhrman
Howdy,

On Tue, 28 Jul 2015 at 3:43pm, Paolo Bolzoni wrote:

 Dear list,

 I am writing a pdf document using LaTeX, since some of the readers
 have problems compiling I'd like to keep also the .pdf under revision
 control.

 The .pdf is actually a binary output of other files, so it should be
 ignored during merge conflicts. I know this violated the basics of a
 scm, but it is possible to tell the repository to treat some file
 differently and do not try to merge them, but simply replace?

I believe doing this:

  $ fossil settings binary-glob *.pdf

would work.  Probably better to do it from the web ui in case there are
other values present in that setting.

Cheers!


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


-- 
Christopher M. Fuhrman
cfuhr...@pobox.com


___
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] Automatically put version / checkout infomation into source code on commit

2015-07-13 Thread Christopher M. Fuhrman
On Mon, 13 Jul 2015 at 9:50pm, Christopher M. Fuhrman wrote:


 Although now that I think about it, using info here is slower than
 using status, so I may change that.

Ah, I stand corrected:

[ cmf-bigMac-09:56 PM ]-pkgsrc $ time fl info
project-name: NetBSD pkgsrc
repository:   /Users/cfuhrman/repos/pkgsrc.fossil
local-root:   /Users/cfuhrman/Documents/dev/pkgsrc/
config-db:/Users/cfuhrman/.fossil
project-code: a93518a42fa8e06695943fd79049ad4fcf8b9d00
checkout: 1d48efddf0177e14b213ccf27360e783775f7c0a 2015-07-13
09:54:20 UTC
parent:   ffe1ad6243d489148705a468bc4a19c131b13c32 2015-07-13
09:53:55 UTC
tags: trunk
comment:  Adapt for p5-pcsc name change. Bump PKGREVISION. (user:
wiz)
check-ins:789466

real0m0.213s
user0m0.080s
sys 0m0.125s
[ cmf-bigMac-09:57 PM ]-pkgsrc $ time fl status
repository:   /Users/cfuhrman/repos/pkgsrc.fossil
local-root:   /Users/cfuhrman/Documents/dev/pkgsrc/
config-db:/Users/cfuhrman/.fossil
checkout: 1d48efddf0177e14b213ccf27360e783775f7c0a 2015-07-13
09:54:20 UTC
parent:   ffe1ad6243d489148705a468bc4a19c131b13c32 2015-07-13
09:53:55 UTC
tags: trunk
comment:  Adapt for p5-pcsc name change. Bump PKGREVISION. (user:
wiz)

real0m1.308s
user0m0.291s
sys 0m0.919s

info is faster than status!


 Cheers!


-- 
Christopher M. Fuhrman
cfuhr...@pobox.com


___
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] Automatically put version / checkout infomation into source code on commit

2015-07-13 Thread Christopher M. Fuhrman
On Mon, 13 Jul 2015 at 4:17am, Michael Weise wrote:


 Thanks for all the answers,

 I wrote my own little script that extracts the output of
 'fossil status' with the help of sed and writes it to a file.
 It's invoked as part of the build process:

 fossil status | sed -n 's/checkout: *\([a-zA-Z0-9]*\) \(.*\)/#ifndef
 CHECKOUTVERSION\n#define CHECKOUTVERSION\n#define
 CHECKOUT_VERSION_STRING \1\n#define CHECKOUT_TIMESTAMP_STRING
 \2\n#endif/p'  ../checkoutVersion.h

Here's how I do it in my GNUmakefile/Makefile:

--begin snippet--
version: VERSION

VERSION:
@fossil info | grep ^checkout | awk '{ printf [%s] %s %s, 
substr($$2, 0, 10), $$3, $$4 }'  VERSION
--end snippet--

Although now that I think about it, using info here is slower than
using status, so I may change that.

Cheers!



 What's the advantage of using a manifest file?

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


-- 
Christopher M. Fuhrman
cfuhr...@pobox.com


___
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] Fossil NetBSD

2015-06-29 Thread Christopher M. Fuhrman
Howdy,

On Sun, 28 Jun 2015 at 11:38pm, Gour wrote:

 Hello,

 recently I moved from Linux to Free/PC-BSD, but consider to switch to NetBSD.

 I recall there was talk in the past about possible migration of NetBSD
 project to Fossil DVCS. There are some Fossil repos available like e.g.

 http://netbsd.sonnenberger.org/timeline

 http://ftp.netbsd.org/pub/NetBSD/misc/repositories/fossil/

 but I wonder what is the current status in regard?

 Is it still considered as an option?

 While chatting with some people in #netbsd I got feeling that some devs are
 concsidering that Fossil does not scale for their needs.

 Is it something which can be overcome or usage of Sqlite (according to some)
 is the stumbling block?


You might want to subscribe[1] to the tech-reposit...@netbsd.org
mailing list to follow the discussion on a potential migration from
CVS to a more modern VCS.  Please be aware that this is a *really*
low-traffic mailing list of late.  You are also more than welcome to
peruse the mailing list archives[2] to see what's been discussed in
the past.


 Sincerely,
 Gour



Cheers!

Footnotes:
[1]  http://www.netbsd.org/cgi-bin/subscribe_list.pl?list=tech-repository

[2]  http://mail-index.netbsd.org/tech-repository/

-- 
Christopher M. Fuhrman
cfuhr...@pobox.com



___
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] hints.wiki patch

2015-03-03 Thread Christopher M. Fuhrman
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Howdy,

You've got a typo.  s/Sub-meun/Sub-menu/

Cheers!

On Sun, 1 Mar 2015 at 1:14pm, jungle Boogie wrote:

 Hello All,

 Now that finding things on the timeline is easier, I propose the below
 diff for #5 here:
 https://www.fossil-scm.org/fossil/doc/trunk/www/hints.wiki

 I don't know how long of a list people would like for hints so I
 didn't add any addition hints.


 --- www/hints.wiki
 +++ www/hints.wiki
 @@ -21,14 +21,16 @@
prior to going off network (for example, on a long plane ride)
to make sure you have all the latest content locally.  Then run
[/help/all|fossil all push] when you get back online to upload
your changes.

 -  5.  Sub-menu options on Timelines lets you select either 20 or 200
 -  records.  But you can manual edit the n= query parameter in the
 -  URL to get any number of records you desire.  To see a complete
 -  timeline graph, set n to some ridiculously large value like 1000.
 +  5.  Sub-meun options on Timelines enables you to display a complete
 +  timeline graph by typing in some ridiculously large value like 1000
 +  in the max field box. You can page by through the timeline by using the
 +  older link at the top and bottom left of the timeline. You may choose
 +  to display files that were changed and easily diff between the current
 +  and last file by simply clicking diff.

6.  You can manually add a c=CHECKIN query parameter to the timeline
URL to get a snapshot of what was going on about the time of some
check-in.  The CHECKIN can be
[./checkin_names.wiki | any valid check-in or version name], including






- -- 
Christopher M. Fuhrman
cfuhr...@pobox.com

-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4
Comment: GPGTools - http://gpgtools.org

iQEcBAEBAgAGBQJU9lXKAAoJEJMBHfiIBijRiowIAJ0Vde36ZpsQv+gA03qM+GZa
ry0NW4HiVw4I7inRb3j7zQaWcFtNyz3VzvT22B6mSBHD+IbQnq0OppL5OUcC3IDz
UAcG3n5yaFqU2rCPEOw8nlVo5mq4YmKp8n4Vpv8FV7HiFQnEcsVd6obwh1+W0cqV
bR0wgEHkqHtk1NvJ5o4EiQmzewwlJ0PnQonfeXkzvshZXmknpewO9yoLuxRTbxPO
B0majbNpzEZPCn18Q1K61XuFNRcuqn9nmtJAPB6Dmg8aiOZxjFR0v3QsF1ZFyzwf
A39KtcbyscS6tKD1HvZIQJccXXjtvHQ/75Pu2gZ8szNSGuy2hKjs1NBn8Xbpyrs=
=zm17
-END PGP SIGNATURE-
___
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] Examples of public Fossil repositories

2015-01-05 Thread Christopher M. Fuhrman
On Fri, 2 Jan 2015 at 6:34am, Richard Hipp wrote:

 I'm trying to compile a list of interesting public Fossil repositories.  My
 list currently includes:

 http://www.fossli-scm.org/fossil/
 http://www.sqlite.org/src/
 http://www.eagle.to/cgi-bin/eagle/timeline
 http://core.tcl.tk/tcl/timeline
 http://www.androwish.org/
 http://netbsd.sonnenberger.org/

 And, of course, all of the repos on http://chiselapp.com/

https://www.fuhrwerks.com/fossil/csrg

This is a SCCS - SVN - Git - Fossil conversion of the original CSRG[1]
BSD Repository.  If this isn't interesting, I don't know what is. ;)


 Are there any others that I should add to the list?




Footnotes:
[1]  http://en.wikipedia.org/wiki/Computer_Systems_Research_Group

-- 
Christopher M. Fuhrman
cfuhr...@pobox.com


___
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] Examples of public Fossil repositories

2015-01-05 Thread Christopher M. Fuhrman
On Mon, 5 Jan 2015 at 9:19am, Jungle Boogie wrote:

 Dear Christopher,
 
 From: Christopher M. Fuhrman cfuhr...@pobox.com
 Sent:  Mon, 5 Jan 2015 08:20:10 -0800 (PST)
 To: Fossil SCM user's discussion
 Subject: Re: [fossil-users] Examples of public Fossil repositories
  https://www.fuhrwerks.com/fossil/csrg

 Just so you know, there's an issue with your SSL.

 www.fuhrwerks.com uses an invalid security certificate. The certificate is not
 trusted because the issuer certificate is unknown. (Error code:
 sec_error_unknown_issuer)

I use certificates signed by CAcert.org.  Unfortunately, not all browsers
will accept those certificates as valid. :(  If anyone can suggest an
alternate certificate signing authority that's reasonably inexpensive, I'm
all ears.

/Chris




 
  This is a SCCS - SVN - Git - Fossil conversion of the original CSRG[1]
  BSD Repository.  If this isn't interesting, I don't know what is. ;)
 
  
   Are there any others that I should add to the list?
  
  
 
 
  Footnotes:
  [1]  http://en.wikipedia.org/wiki/Computer_Systems_Research_Group
 





-- 
Christopher M. Fuhrman
cfuhr...@pobox.com


___
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] Error after fossil import from git: Missing changeset

2014-11-20 Thread Christopher M. Fuhrman
Howdy,

I think I've determined what might be causing the malloc error.  The
repository I'm seeing this with was originally a CVS repository that got
transitioned to SVN and then finally transitioned to fossil via git-svn.
I'm noticing that prior to a certain point in the timeline, there is a
'sym-trunk' tag but *not* a 'branch=trunk' tag.  Every time I try to edit
any commit that has just a 'sym-trunk' tag via the UI, then I get the
malloc error.

So this brings the following question: Is there anyway from the command
line I can tell fossil that the starting commit is the start of a new
branch 'trunk' that propagates?  Remember, I can't use the UI to do this.

Cheers!

/Chris

p.s., When in doubt, blame CVS ;)

On Fri, 14 Nov 2014 at 5:43am, Christopher M. Fuhrman wrote:

 Howdy,

 I re-compiled fossil based off of [5960016a3d] 2014-11-12 14:37:42 UTC and
 did a rebuild of my repository from the new binary.  The good news is that
 after doing this, the missing commit shows up again and my timeline is
 connected.

 Bad news is that when I try to edit earlier commits via the UI I still
 get:

   fossil(83080,0x7fff7a242310) malloc: *** error for object 0x1012c6cd4:
   pointer being freed was not allocated
   *** set a breakpoint in malloc_error_break to debug

 Note I do not see this behavior when using a repo based off the
 fast-export stream I posted earlier.  Since I need to head into work soon,
 I'll be sure to come up with another example repo where I can replicate
 this behavior and create a ticket on the Fossil web site.

 Cheers!

 /Chris

 p.s., Awesome Sig!

 On Fri, 14 Nov 2014 at 1:04am, Stephan Beal wrote:

  
   This behavior was seen on Fossil 1.28.
   ...
   If you require any further information or want me to create a ticket,
   let me know.
  
 
  Hi, Chris! First please try from the trunk - i have a vague recollection
  (possibly wrong) of an allocation error being freed relatively recently. If
  that doesn't work for you, please post a ticket and let us know.
 
 



-- 
Christopher M. Fuhrman
cfuhr...@pobox.com


___
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] Error after fossil import from git: Missing changeset

2014-11-14 Thread Christopher M. Fuhrman
Howdy,

I re-compiled fossil based off of [5960016a3d] 2014-11-12 14:37:42 UTC and
did a rebuild of my repository from the new binary.  The good news is that
after doing this, the missing commit shows up again and my timeline is
connected.

Bad news is that when I try to edit earlier commits via the UI I still
get:

  fossil(83080,0x7fff7a242310) malloc: *** error for object 0x1012c6cd4:
  pointer being freed was not allocated
  *** set a breakpoint in malloc_error_break to debug

Note I do not see this behavior when using a repo based off the
fast-export stream I posted earlier.  Since I need to head into work soon,
I'll be sure to come up with another example repo where I can replicate
this behavior and create a ticket on the Fossil web site.

Cheers!

/Chris

p.s., Awesome Sig!

On Fri, 14 Nov 2014 at 1:04am, Stephan Beal wrote:

 
  This behavior was seen on Fossil 1.28.
  ...
  If you require any further information or want me to create a ticket,
  let me know.
 

 Hi, Chris! First please try from the trunk - i have a vague recollection
 (possibly wrong) of an allocation error being freed relatively recently. If
 that doesn't work for you, please post a ticket and let us know.



-- 
Christopher M. Fuhrman
cfuhr...@pobox.com



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


[fossil-users] Error after fossil import from git: Missing changeset

2014-11-13 Thread Christopher M. Fuhrman
Howdy,

Discovered a potential bug with fossil's ability to import git
repositories.  This issue appears to happen when a git repository has a
commit that removes all files from it.  What happens is that fossil
'skips' the changeset with all files removed in it, resulting in a
dangling ancestor.

Note I am attaching a compressed git fast-export stream from a git
repository I created to illustrate the bug.

How to reproduce using the attached fast-export stream:

 1) gunzip -c example.fi.gz | fossil import --git example.fossil
 2) fossil ui example.fossil
 3) Select 'Timeline'

You will see that 'trunk' goes up until it hits the revision before
the deletion of all files.  Then the revision that adds files back
again is created on a parallel unnamed branch with a dangling
ancestor.

As a side effect of this, if you attempt to open a changeset on the
'dangling' branch and edit it via the UI, you are greeted with the
following:

  fossil(81780,0x7fff7a242310) malloc: *** error for object 0x10db30790:
  pointer being freed was not allocated
  *** set a breakpoint in malloc_error_break to debug

This behavior was seen on Fossil 1.28.

Note I checked the fast-export stream and the 'delete' commit is
there, so something is eating the commit.

As a side note, is there any way to recover from this scenario?  I've
got a personal 16 year old repository that went from CVS - Subversion
- Fossil by way of git that has the 'dangling' commit and I'm unable
to edit the starting point of the dangling commit due to the pointer
error above.

If you require any further information or want me to create a ticket,
let me know.

Cheers!

-- 
Christopher M. Fuhrman
cfuhr...@pobox.com




example.fi.gz
Description: GNU Zip compressed data
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


[fossil-users] Patch: Correct verbiage in merge REMINDER msg

2014-08-04 Thread Christopher M. Fuhrman
Howdy,

I'm attaching a (very small) patch that corrects a minor verbiage issue I
encountered during normal fossil usage.

Please review and thanks for creating fossil :)

/Chris

-- 
Christopher M. Fuhrman
cfuhr...@pobox.com


Index: src/merge.c
==
--- src/merge.c
+++ src/merge.c
@@ -644,11 +644,11 @@
 fossil_warning(WARNING: %d unmanaged files were overwritten,
nOverwrite);
   }
   if( dryRunFlag ){
 fossil_warning(REMINDER: this was a dry run -
-no file were actually changed.);
+no files were actually changed.);
   }
 
   /*
   ** Clean up the mid and pid VFILE entries.  Then commit the changes.
   */

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