View Ticket
Not logged in
Ticket UUID: fbfe43e153ee0e1de9df4d0e51dc1d0e2fce85e0
Title: shash pop will drop the stash even if it could not apply it.
Status: Fixed Type: Code_Defect
Severity: Severe Priority:
Subsystem: Resolution: Fixed
Last Modified: 2011-01-25 23:18:09
Version Found In: 356e877cea
Description & Comments:
Hello,

Say that my _FOSSIL_ file is in /home/project1

I am in /home/project1/foo

fossil changes tells me that foo/bar/baz.txt and bar/foo/baz.txt have both changed. What it lists are paths relative to the directory where _FOSSIL_ is. Those paths are not relative to my CWD.

fossil stash save -m hello foo/bar/baz.txt should fail because it expects a path relative to the CWD, but it will revert both files and make a stash from them.

Then, fossil stash pop, which seems to expect me to be at the root of the working tree, will try to apply the stash, fail to do it, but still drop it, potentially losing work. It should have kept the stash because it could not apply it.

I was lucky to have a recent diff generated by fossil with which I was able to recover my work (two days).