On Feb 17, 2016, at 8:17 AM, Andy Bradford <amb-fos...@bradfords.org> wrote: > > Thus said Warren Young on Wed, 17 Feb 2016 08:10:51 -0700: > >> That gives me a complaint about needing -R. > > .fslckout is the open checkout database that tracks > local changes, it is not part of the Fossil repository proper, and hence > -R will not work with it.
I realized you were talking about the .fslckout database instead of the repo file after I posted that, but .schema stashfile gives no results on my .fslckout files, either. I then created the table manually, with your proposed schema change: CREATE TABLE stashfile( stashid INTEGER REFERENCES stash, rid INTEGER, isAdded BOOLEAN, isRemoved BOOLEAN, isExec BOOLEAN, isLink BOOLEAN, origname TEXT, newname TEXT, delta BLOB, PRIMARY KEY(newname, stashid)); I still get the assertion failure. Also, after the failure, the stashfile table remains empty. So, the failure is happening before anything successfully gets stored. I notice that this table isn’t initially created on in a fresh Fossil repo, but is present after a successful stash of a renamed file. I remind you that this problem I’m having is partially repo-specific, so I can get renamed files to stash in *other* repos on the problem machines. I can’t send this repo to you for testing, but I can do SQL calls against it for you, instrument my Fossil binary, do stack dumps, dump variables in a running fossil process, etc. > It is possible to change the schema but it's a bit involved, so I > hesitate to recommend it unless you feel comfortable with running > SQL commands. I’m the maintainer of MySQL++. So, yes, I’m comfortable with SQL. :) > Just to clarify, are you doing both a rename and an add on the old > filename that was renamed in the same stash? I’m doing “fossil mv --hard some/file.cpp other/file.cpp” then attempting to stash all uncommitted changes. (i.e. “fossil stash save -m blahblah”) _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
