maven-scm-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Naess, Ronny" <Ronny.Na...@avinor.no>
Subject SV: Conflict problem
Date Thu, 21 Sep 2006 12:54:40 GMT
Ok, I thougt this might be a SCM question.

I will ask it at Maven users instead. 

-Ronny 

-----Opprinnelig melding-----
Fra: Emmanuel Venisse [mailto:emmanuel@venisse.net] 
Sendt: 21. september 2006 14:51
Til: scm-users@maven.apache.org
Emne: Re: Conflict problem

Ronny,

This list is for Maven-SCM project, the right list for your pb is the maven users list
(users@maven.apache.org)

Emmanuel

Naess, Ronny a écrit :
> Hi.
>  
> We use HSQLDB as testdatabase (standalone mode aka file) when running 
> test in maven. This works fine, however our tests fail each time after 
> updating the hsqldb.script file. The problem is that Continuum runs 
> all tests every now and then and since we load the testdatabase with 
> testdata pre testing the hsqldb.script file gets updated locally. So 
> when the developer have updatet the hsqldb.script file and checked it 
> in to repos the problem occures when Continuum starts to checkout. The 
> two hsqldb.script files is conflicted and the test will fail right after.
>  
> Is there a solution to this problem? We have automated everything to 
> max with good results so we would very much like to skip a manual 
> conflict merge after each broken build where the problem is this conflict.
>  
> Until we find a good solutions we have to provide a better exception 
> message and the dude that caused the build has to manualy resolve the 
> conflict where continuum runs.
>  
> -Ronny


!DSPAM:45128b01222301272651560!


Mime
View raw message