Release Notes

Shelve operation: we fixed an issue that caused shelved changes to be deleted, even if they were applied later on, in some uncommon scenarios. We bumped into this issue when a shelve created from a cherry pick (i.e. cherry-picking a changeset and choosing to undo the changes after shelve) had the source changeset of the cherry-pick deleted. It happened to all files that were modified only on source. The problem was caused by the changeset where the shelve was applied because it reused the data of the deleted one. When the cherry-pick source changeset was deleted the data was no longer available.

Steps to reproduce:

1. Switch workspace to branch A

2. Change foo.c and check it in -> this creates changeset X

3. Switch workspace to branch B

4. Cherry pick changeset X from branch A to branch B, but don't check it in

5. Shelve the current workspace changes enabling the option 'Undo these changes in the workspace after shelving them' -> This creates shelve Y

6. Apply shelve Y to the workspace

7. Checkin (in branch B) -> This creates changeset Z

8. Delete changeset X (in branch A)

9. Show differences of changeset Z. We notice that changes of that foo.c file are missing. An error message 'Cannot download revision {revId} from server...' is displayed.

Jet backend: The server returned the error message "The given key was not present in the dictionary" when the first write operation in a repository was started by a server-side merge that only contained the merge link (no changed items). Now it's fixed.

Mergetool: When the last line of any of the contributor doesn't have an 'end of line' (EOL) and it's involved in a conflict, the result file showed this line plus the next one on a single line. This issue only happened when the EOL is not ignored by the comparison method. Now it's fixed