2013/2/25 Stephan Beal <sgb...@googlemail.com>: > Here's a reproduce with backtrace (Ubuntu 12.04/x64)... > > On Mon, Feb 25, 2013 at 5:09 PM, Baptiste Daroussin > <baptiste.darous...@gmail.com> wrote: >> >> fossil ci --private -m "test2" >> fossil merge private > > > did you check out trunk between that? When i ci --private (trying to > reproduce this) i am moved to the 'private' branch.
Yes, below is the exacte reproduction of the bug I just got. Is there a way to recover from that or I should reclone the repository? regards, Bapt > > [stephan@host:~/cvs/fossil/priv]$ f com --private -m two > New_Version: 642fa51e511023058279683114518919fa152862 > [stephan@host:~/cvs/fossil/priv]$ f merge private > Fossil internal error: lack both primary and secondary files > > i would expect an error when trying to merge into itself. > > [stephan@host:~/cvs/fossil/priv]$ f co trunk > [stephan@host:~/cvs/fossil/priv]$ f merge private > ADDED hosts > "fossil undo" is available to undo changes to the working checkout. > > [stephan@host:~/cvs/fossil/priv]$ f com -m foo > New_Version: fa09ed1e016bb8505525647a184d88b885977a8a > [stephan@host:~/cvs/fossil/priv]$ f scrub --private > Scrubbing the repository will permanently delete information. > Changes cannot be undone. Continue (y/N)? y > 0.0% complete... > SQLITE_ERROR: no such table: main.delta > SQLITE_ERROR: duplicate column name: mtime > SQLITE_ERROR: duplicate column name: mtime > SQLITE_ERROR: duplicate column name: mtime > 100.0% complete... > [stephan@host:~/cvs/fossil/priv]$ fst > Segmentation fault (core dumped) > [stephan@host:~/cvs/fossil/priv]$ gdb --args f status > GNU gdb (Ubuntu/Linaro 7.4-2012.04-0ubuntu2.1) 7.4-2012.04 > Copyright (C) 2012 Free Software Foundation, Inc. > License GPLv3+: GNU GPL version 3 or later > <http://gnu.org/licenses/gpl.html> > This is free software: you are free to change and redistribute it. > There is NO WARRANTY, to the extent permitted by law. Type "show copying" > and "show warranty" for details. > This GDB was configured as "x86_64-linux-gnu". > For bug reporting instructions, please see: > <http://bugs.launchpad.net/gdb-linaro/>... > Reading symbols from /home/stephan/bin/f...done. > (gdb) r > Starting program: /home/stephan/bin/f status > > Program received signal SIGSEGV, Segmentation fault. > strglob (zGlob=0x4fb0a8 "isexe *", z=0x0) at ./src/glob.c:173 > 173 while( (c2 = (*(z++)))!=0 ){ > (gdb) bt > #0 strglob (zGlob=0x4fb0a8 "isexe *", z=0x0) at ./src/glob.c:173 > #1 0x000000000041c939 in isValidLocalDb (zDbName=0x7fffffffd9e0 > "/home/stephan/cvs/fossil/priv/.fslckout") at ./src/db.c:892 > #2 db_open_local () at ./src/db.c:945 > #3 0x000000000041cae9 in db_must_be_within_tree () at ./src/db.c:1153 > #4 0x0000000000412449 in status_cmd () at ./src/checkin.c:204 > #5 0x0000000000407921 in main (argc=<optimized out>, argv=<optimized out>) > at ./src/main.c:600 > > -- > ----- stephan beal > http://wanderinghorse.net/home/stephan/ > http://gplus.to/sgbeal > > _______________________________________________ > 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
