You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by Chris Graham <ch...@gmail.com> on 2012/02/16 04:01:07 UTC
SCM Diff Command
Hi All.
A question regarding the scm:diff command.
Is the output meant to be in a generic unix style diff format, or the
native type used by the tool?
Here is an example from Jazz:
### Jazz Patch 1.0
#date: "2012-02-16 13:56:51.000000290 +1100"
#itemid: "BogusTest/test.txt" "_FaVF0CZEEeGsm4m-rLi4kg"
"_97450OXCEeCO99joMz1H0g"
#item_type: "_FaVF0CZEEeGsm4m-rLi4kg" "file"
#itemid: "BogusTest" "_-RCqcOXCEeCaDOcKtgRBNw" "_97450OXCEeCO99joMz1H0g"
#item_type: "_-RCqcOXCEeCaDOcKtgRBNw" "folder"
#before_state: "BogusTest/test.txt" "_FaVF0CZEEeGsm4m-rLi4kg"
"_rPySSyZIEeGyurRkTlOj-g"
#
diff -u -N BogusTest/test.txt BogusTest/test.txt
--- BogusTest/test.txt 2011-12-14 22:37:20.000000247 +1100
+++ BogusTest/test.txt 1970-01-01 10:00:00.000000027 +1000
@@ -1,2 +1,4 @@
Test.txt
+
+
So I'm a little uncertain as to whether I need to implement the comments at
the top.
What uses the scm:diff stuff anyway?
I've basically gotten the provider to the point of being able to work with
the release plugin. :-)
Which is all I really need. However, I'd like to try to add the rest of the
functionality into it as well.
-Chris
Re: SCM Diff Command
Posted by Brett Porter <br...@apache.org>.
The format is provider specific, but as long as it can be fed into patch then it should be fine. So the format below looks just fine. The --- +++ lines onwards are standard unified diff.
On 16/02/2012, at 2:01 PM, Chris Graham wrote:
> Hi All.
>
> A question regarding the scm:diff command.
>
> Is the output meant to be in a generic unix style diff format, or the
> native type used by the tool?
>
> Here is an example from Jazz:
>
> ### Jazz Patch 1.0
> #date: "2012-02-16 13:56:51.000000290 +1100"
> #itemid: "BogusTest/test.txt" "_FaVF0CZEEeGsm4m-rLi4kg"
> "_97450OXCEeCO99joMz1H0g"
> #item_type: "_FaVF0CZEEeGsm4m-rLi4kg" "file"
> #itemid: "BogusTest" "_-RCqcOXCEeCaDOcKtgRBNw" "_97450OXCEeCO99joMz1H0g"
> #item_type: "_-RCqcOXCEeCaDOcKtgRBNw" "folder"
> #before_state: "BogusTest/test.txt" "_FaVF0CZEEeGsm4m-rLi4kg"
> "_rPySSyZIEeGyurRkTlOj-g"
> #
> diff -u -N BogusTest/test.txt BogusTest/test.txt
> --- BogusTest/test.txt 2011-12-14 22:37:20.000000247 +1100
> +++ BogusTest/test.txt 1970-01-01 10:00:00.000000027 +1000
> @@ -1,2 +1,4 @@
> Test.txt
>
> +
> +
>
>
> So I'm a little uncertain as to whether I need to implement the comments at
> the top.
>
> What uses the scm:diff stuff anyway?
>
> I've basically gotten the provider to the point of being able to work with
> the release plugin. :-)
>
> Which is all I really need. However, I'd like to try to add the rest of the
> functionality into it as well.
>
> -Chris
--
Brett Porter
brett@apache.org
http://brettporter.wordpress.com/
http://au.linkedin.com/in/brettporter
http://twitter.com/brettporter
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org