maven-scm-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Struberg <strub...@yahoo.de>
Subject Re: svn commit: r1067545 - in /maven/scm/trunk/maven-scm-providers: maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/ maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java
Date Mon, 07 Feb 2011 14:46:33 GMT
No, I use git native if I'm on git projects but for maven-scm I only use svn 1.6.15 via the
commandline on Fedora 14. 

I've now checked the sources and maybe the problem is your use of a 'standard' git repo, whereas
I used a 'bare' repo because this doesn't get affected by gits internal parent logic. In other
words: the ".git" directory in src/test/repository/git/info/ might cause some troubles if
you use  git-svn or git native.

LieGrue,
strub

--- On Mon, 2/7/11, Olivier Lamy <olamy@apache.org> wrote:

> From: Olivier Lamy <olamy@apache.org>
> Subject: Re: svn commit: r1067545 - in /maven/scm/trunk/maven-scm-providers: maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/
maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java
> To: scm-dev@maven.apache.org
> Date: Monday, February 7, 2011, 1:51 PM
> Hello,
> Yes I know (I wanted to revert but didn't have enough time
> this morning).
> That's weird in fact because it fail here.
> Are you using  git svn for working with maven scm ?
> 
> 
> 2011/2/7 Mark Struberg <struberg@yahoo.de>:
> > Hi olivier!
> >
> > what was the reason for the following change?
> >
> > -        assertEquals(
> "cd3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767",
> result.getInfoItems().get( 0 ).getRevision() );
> > +        assertEquals(
> "d42193018c2fc462a103ef6440cd162d73595c53",
> result.getInfoItems().get( 0 ).getRevision() );
> >         //
> >
> > This broke the git-tck on my system.
> > Think we should revert that part.
> >
> > txs and LieGrue,
> > strub
> >
> > --- On Sat, 2/5/11, olamy@apache.org
> <olamy@apache.org>
> wrote:
> >
> >> From: olamy@apache.org
> <olamy@apache.org>
> >> Subject: svn commit: r1067545 - in
> /maven/scm/trunk/maven-scm-providers:
> maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/
> maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/a...
> >> To: scm-commits@maven.apache.org
> >> Date: Saturday, February 5, 2011, 10:39 PM
> >> Author: olamy
> >> Date: Sat Feb  5 22:39:49 2011
> >> New Revision: 1067545
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1067545&view=rev
> >> Log:
> >> [SCM-555] paths reported in svn-exe checkout do
> not match
> >> update command (always reports absolute).
> >> Submitted by Andrew Williams.
> >>
> >> Modified:
> >>
> >>
> maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
> >>
> >>
> 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/AbstractFileCheckingConsumer.java
> >>
> >>
> 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/checkout/SvnCheckOutCommand.java
> >>
> >>
> 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/checkout/SvnCheckOutConsumer.java
> >>
> >> Modified:
> >>
> maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
> >> URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java?rev=1067545&r1=1067544&r2=1067545&view=diff
> >>
> ==============================================================================
> >> ---
> >>
> maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
> >> (original)
> >> +++
> >>
> maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/info/GitInfoCommandTckTest.java
> >> Sat Feb  5 22:39:49 2011
> >> @@ -45,7 +45,7 @@ public class
> GitInfoCommandTckTest
> >>          assertNotNull(
> >> repository );
> >>          InfoScmResult result
> >> = provider.info( repository, new ScmFileSet(
> >> getRepositoryRoot() ), new CommandParameters() );
> >>          assertNotNull(
> >> result );
> >> -        assertEquals(
> >> "cd3c0dfacb65955e6fbb35c56cc5b1bf8ce4f767",
> >> result.getInfoItems().get( 0 ).getRevision() );
> >> +        assertEquals(
> >> "d42193018c2fc462a103ef6440cd162d73595c53",
> >> result.getInfoItems().get( 0 ).getRevision() );
> >>          //
> >>      }
> >>
> >>
> >> 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/AbstractFileCheckingConsumer.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/AbstractFileCheckingConsumer.java?rev=1067545&r1=1067544&r2=1067545&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/AbstractFileCheckingConsumer.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/AbstractFileCheckingConsumer.java
> >> Sat Feb  5 22:39:49 2011
> >> @@ -113,4 +113,9 @@ public abstract class
> >> AbstractFileChecki
> >>          return revision;
> >>      }
> >>
> >> +    public File getWorkingDirectory()
> >> +    {
> >> +        return workingDirectory;
> >> +    }
> >> +
> >>  }
> >>
> >> 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/checkout/SvnCheckOutCommand.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/checkout/SvnCheckOutCommand.java?rev=1067545&r1=1067544&r2=1067545&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/checkout/SvnCheckOutCommand.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/checkout/SvnCheckOutCommand.java
> >> Sat Feb  5 22:39:49 2011
> >> @@ -74,7 +74,7 @@ public class SvnCheckOutCommand
> >>
> >>          Commandline cl =
> >> createCommandLine( repository,
> fileSet.getBasedir(),
> >> version, url, recursive );
> >>
> >> -        SvnCheckOutConsumer consumer =
> >> new SvnCheckOutConsumer( getLogger(),
> >> fileSet.getBasedir().getParentFile() );
> >> +        SvnCheckOutConsumer consumer =
> >> new SvnCheckOutConsumer( getLogger(),
> fileSet.getBasedir()
> >> );
> >>
> >>
> >>    CommandLineUtils.StringStreamConsumer
> >> stderr = new
> CommandLineUtils.StringStreamConsumer();
> >>
> >>
> >> 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/checkout/SvnCheckOutConsumer.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/checkout/SvnCheckOutConsumer.java?rev=1067545&r1=1067544&r2=1067545&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/checkout/SvnCheckOutConsumer.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/checkout/SvnCheckOutConsumer.java
> >> Sat Feb  5 22:39:49 2011
> >> @@ -51,6 +51,11 @@ public class
> SvnCheckOutConsumer
> >>          String statusString
> >> = line.substring( 0, 1 );
> >>
> >>          String file =
> >> line.substring( 3 ).trim();
> >> +        //[SCM-368]
> >> +        if ( file.startsWith(
> >> getWorkingDirectory().getAbsolutePath() ) )
> >> +        {
> >> +            file =
> >> file.substring(
> >> getWorkingDirectory().getAbsolutePath().length() +
> 1 );
> >> +        }
> >>
> >>          ScmFileStatus
> >> status;
> >>
> >>
> >>
> >>
> >
> >
> >
> >
> 
> 
> 
> -- 
> Olivier Lamy
> http://twitter.com/olamy
> http://www.linkedin.com/in/olamy
> 


      

Mime
View raw message