Fossil SCM
Fossil stash looses changes when used on an uncomitted merge
df43e9ae608af7c…
· opened 12 years, 8 months ago
- Type
- Code_Defect
- Priority
- —
- Severity
- Severe
- Resolution
- —
- Subsystem
- —
- Created
- Aug. 5, 2013 12:26 p.m.
Steps to reproduce
Make some changes (to existing files) and commit them to a branch (private branch used in example) Switch to another branch merge the change stash the uncomitted changes apply the stashed change commit
Expected
Stash contains changed lines Applying stash causes merged changes to be re-applied Commit contains merge.
Actual
Working copy reverted Stash contains BLANK diffs for each changed file <- This means that the diff has been lost Applying the stash has no effect Commit does not contain merge.
This has been written up in a test script here: [https://gist.github.com/stestagg/6155515]
Comments (1)
Steps to reproduce
Make some changes (to existing files) and commit them to a branch (private branch used in example) Switch to another branch merge the change stash the uncomitted changes apply the stashed change commit
Expected
Stash contains changed lines Applying stash causes merged changes to be re-applied Commit contains merge.
Actual
Working copy reverted Stash contains BLANK diffs for each changed file <- This means that the diff has been lost Applying the stash has no effect Commit does not contain merge.
This has been written up in a test script here: [https://gist.github.com/stestagg/6155515]