4 results found
It looks that currently MergeTo operation is ignoring --mergetype parameter. If only automatic merge of changes from both source and destination is possible Plastic is doing it.
It would be good to have a chance to explicitly show that changes only on one side are allowed and exit with failure if there are some also at the other.
Additionaly for now it is not possible to give comment which will be used for check-in operation after successful mergeTo.6 votes
On the release 184.108.40.2067, we added the new server-side merge that extends the existing merge-to functionality.
Using the server-side merge, the file conflicts can be resolved and the merge resolution options (—mergetype, —keepsource & —keepdestination) are supported.
The server-side merge is still on preview so you need to enable it adding the following setting on the client.conf. Check how to do it on the release notes: https://www.plasticscm.com/download/releasenotes/220.127.116.117
Remarks, the server and client version must be equal or newer than 18.104.22.1687 to use the server-side merge.
We comment option will be documented soon, we already plan a task to do it in the next few weeks. Sorry for the delay.
The Branch Explorer "Options" sidebar has its "tabs" in a vertical layout, which works better when there are several tabs. Other sidebars (in the Branches and Changesets views) use horizontal tabs instead. It would make sense to unify these so the same type of sidebar component is used in all these places.
Additionally, I think the "View History" view should have a sidebar as well...12 votes
Our plan is to redo the windows GUI and implement what we already have on Mac and Linux… which is exactly what you’re asking for :-)
Currently the option is instead of timestamps. It would be faster just to check the contents if the timestamps don't match (unless it already does and this is just a labelling issue).10 votes
Add a switch to the command line tool that gives the same functionality as the GUI tool's "Synchronize All" function. Additionally, give [both] the ability to synchronize all views at the same time.
This would allow easier scripting of "backups" to a central server.50 votes
- Don't see your idea?