Thanks, Emmanuel. I did almost what you suggested. We have a common artifact with test resources, a directory containing HSQLDB and more. I added a antrun proc to the process-test-resources with a mission to copy the database.script to database_whatever.script. The tests setup then access database_whatever and SCM conflicts is no more an issue for us. Problem solved :-)
-Ronny -----Opprinnelig melding----- Fra: Emmanuel Venisse [mailto:[EMAIL PROTECTED] Sendt: 21. september 2006 15:09 Til: Maven Users List Emne: Re: SCM conflict problem In your tests, you can copy hsqldb files in target directory and load them from it instead of from the source directory. So you won't work directly on your scm files. 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 > --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] !DSPAM:45128f31264771573131950! --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
