On 2/10/2016 10:41 PM, Andy Bradford wrote:
Thus said Ross Berteig on Wed, 10 Feb 2016 15:48:40 -0800:
which as expected renamed the file in the repository but not on the
disk. It then says
fossil stash -m "B 2016-02-09"
Did you mean:
fossil stash save -m "B 2016-02-09"
Yes, typo in transcribing to email. The actual command is buried inside
test/stash.test inside a call to stash-test. (In the current checkin,
hidden inside an if {false} {} block pending this discussion.)
ERROR: no such file: c:/Users/Ross/Documents/tmp/fbuild/stash/f1new
What was fossil stash supposed to do in this circumstance?
It marked the file as being renamed but did not change the disk, as
documented in ``fossil help mv'': ....
Right. "It" being fossil mv, not fossil stash save. That seems to be the
condition in which the OP reports seeing the assertion fail at
delta.c:231, which I'm trying to replicate in a test case.
....
You asked Fossil to prepare the repository for a file move, but never
moved the files. Then when you attempted to stash the change, Fossil
complained because it expected to find f1new, but you never renamed f1
to f1new. If you had also then done ``fossil status'' it would have
reported f1new as MISSING.
So is this the expected behavior then?
Fossil help stash says "save the current changes... as a new stash" but
is silent about the case of a rename marked in the repo but not
completed on disk.
Since the purpose (as I understand it) of the fossil stash command is to
allow partially completed work to be set aside and recalled later, it
seems logical (and necessary) that renames are part of what it saves.
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.
So what I'm really asking here is whether that MISSING error produced by
fossil stash save represents a bug (shortcoming at least) in the
documentation or a bug in the stash itself?
--
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
