Fossil SCM
fossil stash does not re-Add files
b052bbc8c61e62f…
· opened 13 years ago
- Type
- Code_Defect
- Priority
- —
- Severity
- Minor
- Resolution
- Fixed
- Subsystem
- —
- Created
- April 2, 2013 8:53 a.m.
Donnys-MacBook-Pro:trunk donny$ fossil stash apply 3 UPDATE Makefile.darwin UPDATE Makefile.linux UPDATE Makefile.win32 UPDATE NMakefile.win32 UPDATE source/common/common.h ADD source/common/input_handler.h ADD source/common/input_handler.cpp "fossil undo" is available to undo changes to the working checkout. Donnys-MacBook-Pro:trunk donny$ fossil status repository: /Users/donny/Developer/wilderness/trunk/../../fossils/wilderness.fossil local-root: /Users/donny/Developer/wilderness/trunk/ checkout: xxxxxxxx parent: xxxxxx tags: trunk comment: Made a variable const. (user: Donny) EDITED Makefile.darwin EDITED Makefile.linux EDITED Makefile.win32 EDITED NMakefile.win32 EDITED source/common/common.h
Summary: Add a file with fossil add and then save a stash. When applying the previously saved stash, the previously added files will be restored, but they have not been readded to the working copy, so fossil add must be entered manually after applying the stash. I think this is a bug if the intent of the stash is to restore the working copy to the state from when the stash was saved.
Comments (2)
Donnys-MacBook-Pro:trunk donny$ fossil stash apply 3 UPDATE Makefile.darwin UPDATE Makefile.linux UPDATE Makefile.win32 UPDATE NMakefile.win32 UPDATE source/common/common.h ADD source/common/input_handler.h ADD source/common/input_handler.cpp "fossil undo" is available to undo changes to the working checkout. Donnys-MacBook-Pro:trunk donny$ fossil status repository: /Users/donny/Developer/wilderness/trunk/../../fossils/wilderness.fossil local-root: /Users/donny/Developer/wilderness/trunk/ checkout: xxxxxxxx parent: xxxxxx tags: trunk comment: Made a variable const. (user: Donny) EDITED Makefile.darwin EDITED Makefile.linux EDITED Makefile.win32 EDITED NMakefile.win32 EDITED source/common/common.h
Summary: Add a file with fossil add and then save a stash. When applying the previously saved stash, the previously added files will be restored, but they have not been readded to the working copy, so fossil add must be entered manually after applying the stash. I think this is a bug if the intent of the stash is to restore the working copy to the state from when the stash was saved.
Fixed in [db052aa4c6] (thanks to Andy Bradford)