how to create diff in patch file format using 'cm'

[abhiravk]

Hi,

 

How can I create a diff file using command line tool ('cm')?

 

cm diff command only show that the name of the file.

> cm diff cs:277 cs:279

> C "/home/abhiravk/workspace/plastic/fandu/ignore.conf"

 

Moreover '--all' option doesn't work with 'diff' command; maybe it is applied by default.

> cm diff cs:277 cs:279 --all

> diff: Unexpected option --all

 

 

Regards,

Abhirav Kushwaha

[manu]

Hello Abhirav,

 

right now it's not possible but stay tuned to us due to we  are going to release this feature very very soon.

[abhiravk]

   eagerly waiting

[abhiravk]

Hi manu,

 

Any update on this issue?

[calbzam]

Hi,

 

 

This feature is in testing, but not yet released. I will update this post once the feature is relased

 

Regards,

Carlos

[abhiravk]

I am glad to know that this feature is around the corner

[nyet]

Please, this functionality is something that should have been in the initial release. What use is an SCM that can't be used to automate patch generation?

[nyet]

I ended up with this in client.conf

    <DiffToolData>
      <FileType>enTextFile</FileType>
      <FileExtensions>*</FileExtensions>
      <Tools>
        <string>diff -u @sourcefile @destinationfile</string>
      </Tools>
    </DiffToolData>

But that affects all diffs, not just "cm diff"

[manu]

Yes, it affects to all the Plastic SCM operations that involve a diff.

 

We are closer to publish our own patch command. I'll keep this post updated when we release it.

[PolishRenegade]

Hey there,

 

Any news about this?

[manu]

Not yet sorry

 

Can you make some noise here?? https://plasticscm.uservoice.com/forums/15467-general/suggestions/2579737-unix-diff-output-for-file-differences

 

Please comment that the patch will be also a nice thing to have... Or if you want create an specific idea for the patch thing, you'll have my 3 points

[PolishRenegade]

Added my votes + comments.

 

Thanks!

[hlx]

Hi PSCM dev team,

 

Please, we need such a feature. We can have the diff list between 2 changesets/ labels but nothing to convert this information into a patch file. Any news about this (roadmap, labs version,...) ?

Note : I already added my 3 votes on the appropriate uservoice thread.

 

Regards,

 

hlx

[hlx]

Hi PSCM dev team,

 

I am back again since there is no news about that while it seems urgent to do something since there are still no workaround. Can you give some feedback on it ?

 

Regards,

 

hlx

[manu]

Hi hlx,

 

let me discuss it internally. We'll keep you posted.

[ThiL]

Hi all,

 

I work on a development project and it needs a file containing differences between two changeset. So I need such a feature.

Thank you for keeping me informed of the progress of this project

 

Yours faithfully,

 

ThiL

[hlx]

Hi hlx,

 

let me discuss it internally. We'll keep you posted.

Hi Manu,

 

Great to hear that you keep an eye on this. Thank you.

Hlx

[hlx]

Hi all,

 

Since the patch feature seems not to be planned for now, I would like to know if adding an "export view data" command/GUI button in the diff changeset window could be doable ? Using the exported xml file could be a good stating point.
 

Regards

 

Hlx

[manu]

Hi all,

the patch feature is about to be released, it's currently under the release pipeline and shouldn't take long to be public.

Keep tuned!

[manu]

This was done looooong time ago.

And we recently did this: http://blog.plasticscm.com/2018/11/unified-diff-of-branch.html