Java

NAVIGATION
CATEGORIES
REFERRENCE
LINKS
  • SCM conflict problem

    1 answers - 1020 bytes - related search similar search Add To My Delicious Add To My Stumble Upon Add To My Google Mark Add To My Facebook Add To My Digg Add To My Reddit

    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
  • No.1 | | 1390 bytes | |

    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 :
    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: users-unsubscribe (AT) maven (DOT) apache.org
    For additional commands, e-mail: users-help (AT) maven (DOT) apache.org

Re: SCM conflict problem


max 4000 letters.
Your nickname that display:
In order to stop the spam: 5 + 4 =
QUESTION ON "Java"

EMSDN.COM