Skip to content
← General

I suggest you ...

General

Categories

JUMP TO ANOTHER FORUM

(thinking…)

MergeTo operation shall support --mergetype and -c/-commentsfile

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
Vote

We're glad you're here

Please sign in to leave feedback
Signed in as (Sign out)
Close
Close
You have left! (?) (thinking…)
Piotr Mis shared this idea  ·   ·  Report…  ·  Admin →
How important is this to you?

We're glad you're here

Please sign in to leave feedback
Signed in as (Sign out)
Close
Close
planned  ·  AdminCodice Software (CEO / Founder, plasticscm) responded  · 

On the release 7.0.16.2077, 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/7.0.16.2077

Remarks, the server and client version must be equal or newer than 7.0.16.2077 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.

Best regards

Borja

Show previous admin responses (1)

We're glad you're here

Please sign in to leave feedback
Signed in as (Sign out)
Close
Close
Submitting...
An error occurred while saving the comment
  • Piotr Mis commented  ·   ·  Report

    As -c/-commentsfile are already supported you can discard and only improve help.

    Regarding --mergetype. My understanding of this option was different (see discussion on forum: http://www.plasticscm.net/index.php?/topic/3025-merge-to-in-commandline/)

    Just adding support of --mergetype during MergeTo is not needed. However it was adviced in mentioned thread to post idea here.

    If it is possible to convert this one into: Add option in merge (regular and mergeto) to "only allow the merge if src/dst changes it" then I propose to convert.
    If not possible then this one can be discarded and I will post new one.

  • Piotr Mis commented  ·   ·  Report

    Just checked that -c and -commentsfile are supported.
    They are only missing in help displayed after "cm merge --help"