You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ol...@apache.org on 2009/12/01 00:29:16 UTC
svn commit: r885618 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src:
main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/
test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/
Author: olamy
Date: Mon Nov 30 23:29:16 2009
New Revision: 885618
URL: http://svn.apache.org/viewvc?rev=885618&view=rev
Log:
revert SCM-487
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java?rev=885618&r1=885617&r2=885618&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java Mon Nov 30 23:29:16 2009
@@ -230,7 +230,8 @@
cl.createArg().setValue( messageFile.getAbsolutePath() );
- cl.createArg().setValue( "--parents" );
+ // SCM-487 olamy : this need a svn 1.5 cli
+ //cl.createArg().setValue( "--parents" );
if ( scmTagParameters != null && scmTagParameters.getScmRevision() != null )
{
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java?rev=885618&r1=885617&r2=885618&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java Mon Nov 30 23:29:16 2009
@@ -44,7 +44,7 @@
testCommandLine( "scm:svn:svn+ssh://foo.com/svn/trunk", "svntag", messageFile, "user",
"svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath() +
- " --parents . svn+ssh://user@foo.com/svn/tags/svntag", null );
+ " . svn+ssh://user@foo.com/svn/tags/svntag", null );
}
public void testTagRemoteTagHttps()
@@ -57,7 +57,7 @@
scmTagParameters.setRemoteTagging( true );
testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
"svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath()
- + " --parents https://foo.com/svn/trunk https://foo.com/svn/tags/svntag", scmTagParameters );
+ + " https://foo.com/svn/trunk https://foo.com/svn/tags/svntag", scmTagParameters );
}
public void testTagRemoteTagHttpsWithRevision()
@@ -71,7 +71,7 @@
scmTagParameters.setScmRevision( "12" );
testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
"svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath()
- + " --parents --revision 12 https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
+ + " --revision 12 https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
scmTagParameters );
}
Re: svn commit: r885618 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src:
main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/
test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/
Posted by Olivier Lamy <ol...@apache.org>.
the code is AS BEFORE except two commented lines.
2009/12/1 Dan Tran <da...@gmail.com>:
> oops, I miss read the changes. but still want to ask,
>
> the change still compatible with svn 1.4 right?
>
> -Dan
>
> On Mon, Nov 30, 2009 at 3:46 PM, Dan Tran <da...@gmail.com> wrote:
>> is it necessary to required svn 1.5?? and break backward compatibility?
>>
>> - cl.createArg().setValue( "--parents" );
>> + // SCM-487 olamy : this need a svn 1.5 cli
>> + //cl.createArg().setValue( "--parents" );
>>
>> I hope release plugin would never pick this up
>>
>>
>>
>> -Dan
>>
>> On Mon, Nov 30, 2009 at 3:29 PM, <ol...@apache.org> wrote:
>>> Author: olamy
>>> Date: Mon Nov 30 23:29:16 2009
>>> New Revision: 885618
>>>
>>> URL: http://svn.apache.org/viewvc?rev=885618&view=rev
>>> Log:
>>> revert SCM-487
>>>
>>> Modified:
>>> maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
>>> maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
>>>
>>> Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
>>> URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java?rev=885618&r1=885617&r2=885618&view=diff
>>> ==============================================================================
>>> --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java (original)
>>> +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java Mon Nov 30 23:29:16 2009
>>> @@ -230,7 +230,8 @@
>>>
>>> cl.createArg().setValue( messageFile.getAbsolutePath() );
>>>
>>> - cl.createArg().setValue( "--parents" );
>>> + // SCM-487 olamy : this need a svn 1.5 cli
>>> + //cl.createArg().setValue( "--parents" );
>>>
>>> if ( scmTagParameters != null && scmTagParameters.getScmRevision() != null )
>>> {
>>>
>>> Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
>>> URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java?rev=885618&r1=885617&r2=885618&view=diff
>>> ==============================================================================
>>> --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java (original)
>>> +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java Mon Nov 30 23:29:16 2009
>>> @@ -44,7 +44,7 @@
>>>
>>> testCommandLine( "scm:svn:svn+ssh://foo.com/svn/trunk", "svntag", messageFile, "user",
>>> "svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath() +
>>> - " --parents . svn+ssh://user@foo.com/svn/tags/svntag", null );
>>> + " . svn+ssh://user@foo.com/svn/tags/svntag", null );
>>> }
>>>
>>> public void testTagRemoteTagHttps()
>>> @@ -57,7 +57,7 @@
>>> scmTagParameters.setRemoteTagging( true );
>>> testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
>>> "svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath()
>>> - + " --parents https://foo.com/svn/trunk https://foo.com/svn/tags/svntag", scmTagParameters );
>>> + + " https://foo.com/svn/trunk https://foo.com/svn/tags/svntag", scmTagParameters );
>>> }
>>>
>>> public void testTagRemoteTagHttpsWithRevision()
>>> @@ -71,7 +71,7 @@
>>> scmTagParameters.setScmRevision( "12" );
>>> testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
>>> "svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath()
>>> - + " --parents --revision 12 https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
>>> + + " --revision 12 https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
>>> scmTagParameters );
>>> }
>>>
>>>
>>>
>>>
>>
>
--
Olivier
Re: svn commit: r885618 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src:
main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/
test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/
Posted by Dan Tran <da...@gmail.com>.
oops, I miss read the changes. but still want to ask,
the change still compatible with svn 1.4 right?
-Dan
On Mon, Nov 30, 2009 at 3:46 PM, Dan Tran <da...@gmail.com> wrote:
> is it necessary to required svn 1.5?? and break backward compatibility?
>
> - cl.createArg().setValue( "--parents" );
> + // SCM-487 olamy : this need a svn 1.5 cli
> + //cl.createArg().setValue( "--parents" );
>
> I hope release plugin would never pick this up
>
>
>
> -Dan
>
> On Mon, Nov 30, 2009 at 3:29 PM, <ol...@apache.org> wrote:
>> Author: olamy
>> Date: Mon Nov 30 23:29:16 2009
>> New Revision: 885618
>>
>> URL: http://svn.apache.org/viewvc?rev=885618&view=rev
>> Log:
>> revert SCM-487
>>
>> Modified:
>> maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
>> maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
>>
>> Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
>> URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java?rev=885618&r1=885617&r2=885618&view=diff
>> ==============================================================================
>> --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java (original)
>> +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java Mon Nov 30 23:29:16 2009
>> @@ -230,7 +230,8 @@
>>
>> cl.createArg().setValue( messageFile.getAbsolutePath() );
>>
>> - cl.createArg().setValue( "--parents" );
>> + // SCM-487 olamy : this need a svn 1.5 cli
>> + //cl.createArg().setValue( "--parents" );
>>
>> if ( scmTagParameters != null && scmTagParameters.getScmRevision() != null )
>> {
>>
>> Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
>> URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java?rev=885618&r1=885617&r2=885618&view=diff
>> ==============================================================================
>> --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java (original)
>> +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java Mon Nov 30 23:29:16 2009
>> @@ -44,7 +44,7 @@
>>
>> testCommandLine( "scm:svn:svn+ssh://foo.com/svn/trunk", "svntag", messageFile, "user",
>> "svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath() +
>> - " --parents . svn+ssh://user@foo.com/svn/tags/svntag", null );
>> + " . svn+ssh://user@foo.com/svn/tags/svntag", null );
>> }
>>
>> public void testTagRemoteTagHttps()
>> @@ -57,7 +57,7 @@
>> scmTagParameters.setRemoteTagging( true );
>> testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
>> "svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath()
>> - + " --parents https://foo.com/svn/trunk https://foo.com/svn/tags/svntag", scmTagParameters );
>> + + " https://foo.com/svn/trunk https://foo.com/svn/tags/svntag", scmTagParameters );
>> }
>>
>> public void testTagRemoteTagHttpsWithRevision()
>> @@ -71,7 +71,7 @@
>> scmTagParameters.setScmRevision( "12" );
>> testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
>> "svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath()
>> - + " --parents --revision 12 https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
>> + + " --revision 12 https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
>> scmTagParameters );
>> }
>>
>>
>>
>>
>
Re: svn commit: r885618 - in /maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src:
main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/
test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/
Posted by Dan Tran <da...@gmail.com>.
is it necessary to required svn 1.5?? and break backward compatibility?
- cl.createArg().setValue( "--parents" );
+ // SCM-487 olamy : this need a svn 1.5 cli
+ //cl.createArg().setValue( "--parents" );
I hope release plugin would never pick this up
-Dan
On Mon, Nov 30, 2009 at 3:29 PM, <ol...@apache.org> wrote:
> Author: olamy
> Date: Mon Nov 30 23:29:16 2009
> New Revision: 885618
>
> URL: http://svn.apache.org/viewvc?rev=885618&view=rev
> Log:
> revert SCM-487
>
> Modified:
> maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
> maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
>
> Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java
> URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java?rev=885618&r1=885617&r2=885618&view=diff
> ==============================================================================
> --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java (original)
> +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnTagCommand.java Mon Nov 30 23:29:16 2009
> @@ -230,7 +230,8 @@
>
> cl.createArg().setValue( messageFile.getAbsolutePath() );
>
> - cl.createArg().setValue( "--parents" );
> + // SCM-487 olamy : this need a svn 1.5 cli
> + //cl.createArg().setValue( "--parents" );
>
> if ( scmTagParameters != null && scmTagParameters.getScmRevision() != null )
> {
>
> Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java
> URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java?rev=885618&r1=885617&r2=885618&view=diff
> ==============================================================================
> --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java (original)
> +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/tag/SvnExeTagCommandTckTest.java Mon Nov 30 23:29:16 2009
> @@ -44,7 +44,7 @@
>
> testCommandLine( "scm:svn:svn+ssh://foo.com/svn/trunk", "svntag", messageFile, "user",
> "svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath() +
> - " --parents . svn+ssh://user@foo.com/svn/tags/svntag", null );
> + " . svn+ssh://user@foo.com/svn/tags/svntag", null );
> }
>
> public void testTagRemoteTagHttps()
> @@ -57,7 +57,7 @@
> scmTagParameters.setRemoteTagging( true );
> testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
> "svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath()
> - + " --parents https://foo.com/svn/trunk https://foo.com/svn/tags/svntag", scmTagParameters );
> + + " https://foo.com/svn/trunk https://foo.com/svn/tags/svntag", scmTagParameters );
> }
>
> public void testTagRemoteTagHttpsWithRevision()
> @@ -71,7 +71,7 @@
> scmTagParameters.setScmRevision( "12" );
> testCommandLine( "scm:svn:https://foo.com/svn/trunk", "svntag", messageFile, "user",
> "svn --username user --non-interactive copy --file " + messageFile.getAbsolutePath()
> - + " --parents --revision 12 https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
> + + " --revision 12 https://foo.com/svn/trunk https://foo.com/svn/tags/svntag",
> scmTagParameters );
> }
>
>
>
>