Overview
Artifact ID: | 1a4feda3179b286e701a26eed389759df902536c |
---|---|
Ticket: | fbfe43e153ee0e1de9df4d0e51dc1d0e2fce85e0
shash pop will drop the stash even if it could not apply it. |
User & Date: | BM 2011-01-24 16:52:26 |
Changes
- comment changed to:
Hello, Say that my <tt>_FOSSIL_</tt> file is in <tt>/home/project1</tt> I am in <tt>/home/project1/foo</tt> <tt>fossil changes</tt> tells me that <tt>foo/bar/baz.txt</tt> and <tt>bar/foo/baz.txt</tt> have both changed. What it lists are paths relative to the directory where <tt>_FOSSIL_</tt> is. Those paths are not relative to my CWD. <tt>fossil stash save -m hello foo/bar/baz.txt</tt> <b>should fail</b> because it expects a path relative to the CWD, but it will revert both files and make a stash from them. Then, <tt>fossil stash pop</tt>, 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, <b>potentially losing work</b>. 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).