| Ticket Hash: | df43e9ae608af7cf53c17e2d2876991794dbf5f6 | ||
| Title: | Fossil stash looses changes when used on an uncomitted merge | ||
| Status: | Open | Type: | Code_Defect |
| Severity: | Severe | Priority: | |
| Subsystem: | Resolution: | ||
| Last Modified: |
2013-08-05 12:26:18 11.84 years ago |
Created: |
2013-08-05 12:26:18 11.84 years ago |
| Version Found In: | 1.25 [d2e07756d9] | ||
| User Comments: | ||||
nobody added on 2013-08-05 12:26:18:
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] | ||||