On 2/11/2016 10:06 AM, Ross Berteig wrote:
What does fossil revert do in this circumstance?
It says:
REVERT f1
DELETE f1new
"fossil undo" is available to undo changes to the working checkout.
and has now forgotten the pending rename.
I think that fossil stash save *should* do the same thing. It doesn't.
I've updated the test case in stash.test to call this a knownBug.
While looking at revert.test, I noticed another interesting edge case
surrounding renames:
$ fossil mv f1 f1old
$ mv f1 f1old
$ echo "hi" > f1
$ fossil add f1
$ fossil revert
Replacing "revert" with "stash" causes SQLite to freak out:
SQLITE_CONSTRAINT: {abort at 19 in [INSERT INTO stashfile(stashid,
rid, isAdded, isRemoved, isExec, isLink,origname, newname,
delta)VALUES(1,:rid,:isadd,:isrm,:isexe,:islink,:orig,:new,:content)]:
UNIQUE constraint failed: stashf}
This is now tested in stash.test, and also marked as a knownBug.
--
Ross Berteig [email protected]
Cheshire Engineering Corp. http://www.CheshireEng.com/
+1 626 303 1602
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
