maven-scm-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Naess, Ronny" <>
Subject Conflict problem
Date Thu, 21 Sep 2006 12:08:51 GMT
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.

View raw message