Release Notes

Now the server-side merge (preview feature) can apply an existing shelve.

Example:

cm merge sh:2 --to=br:/main --merge

If that shelve was created using the server-side merge (so it contains merge traceability info) and it's applied on the same destination than the original merge, the created changeset will include merge traceability from the original merge. What this is mean:

* Using the server-side merge, we perform a merge from changeset 5 (br:/main/task head) to changeset 10 (br:/main head), leaving the result on the shelve 2.

* Using the server-side merge, we apply the shelve 2 on the changeset 10, creating the changeset 11.

* The changeset 11 will include a merge link from changeset 5 and all info about the changes done on that merge. The same merge traceability that if we merge the changeset 5 to the changeset 10 directly without using the intermediate shelve.

Additionally, the merge operation can now ensure that there are no changes on the destination contributor (because the ancestor and the destination contributor are the same) using the option '--no-dst-changes'. This option is particularly useful to ensure that the destination branch head is the same one that was there when the shelve was created. It also ensures that the original merge traceability can be applied.

Example:

cm merge sh:2 --to=br:/main --merge --no-dst-changes

Gluon UI: Switching a workspace between gluon and standard modes could easily leave an out-of-date directories configuration. Now, the directories configuration is automatically restored by the gluon update when switching from a workspace in standard mode. This way, new files in the repository are automatically downloaded from Gluon again.