Hi, The file dolfin/parameter/Parameters.cpp conflicts with dolfin/parameter/parameters.cpp on both Windows and Mac resulting in that the buildslaves on these platforms are unable to update the hg repositories:
*** Checking out dolfin *** [1/1] /usr/local/src/simula-jhbuild/scripts/hg-update.py pulling from http://www.fenics.org/hg/dolfin searching for changes adding changesets adding manifests adding file changes added 1 changesets with 7 changes to 7 files (run 'hg update' to get a working copy) abort: case-folding collision between dolfin/parameter/parameters.cpp and dolfin/parameter/Parameters.cpp Johannes On Fri, May 8, 2009 14:11, DOLFIN wrote: > One or more new changesets pushed to the primary dolfin repository. > A short summary of the last three changesets is included below. > > changeset: 6101:f22b49031d081323d6c6ce18eccbb12c80240b22 > tag: tip > user: Anders Logg <[email protected]> > date: Fri May 08 14:11:28 2009 +0200 > files: ChangeLog dolfin/parameter/NewParameter.cpp > dolfin/parameter/NewParameter.h dolfin/parameter/Parameters.cpp > dolfin/parameter/Parameters.h dolfin/parameter/dolfin_parameter.h > sandbox/misc/cpp/main.cpp > description: > Add initial version of new parameter system. See test in sandbox/misc. > > Implementation similar to before, but much simplified as a result of > removing the ParameterValue class and subclassing (New)Parameter directly. > > Implementation consists of two classes: Parameters and (New)Parameter. > Only supports int and double so far. Range checks implemented. > > Check if this looks ok. Will continue to add more features. > > > changeset: 6100:ee13793d2af040600cd3fb3a4a7107688684d4a2 > user: Anders Logg <[email protected]> > date: Fri May 08 13:32:02 2009 +0200 > files: dolfin/log/Logger.cpp dolfin/log/Logger.h dolfin/log/log.cpp > dolfin/log/log.h > description: > Add info_underline() for writing underlined messages > > > changeset: 6099:eb49cd88745f3e453acc8f6e26724be1daf061ca > user: Anders Logg <[email protected]> > date: Thu May 07 14:42:32 2009 +0200 > files: dolfin/io/NewXMLParameterList.cpp dolfin/io/XMLFile.cpp > dolfin/parameter/Parameter.cpp dolfin/parameter/Parameter.h > dolfin/parameter/ParameterList.cpp dolfin/parameter/ParameterList.h > dolfin/parameter/ParameterValue.cpp dolfin/parameter/ParameterValue.h > dolfin/swig/typemaps.i > description: > Add range checks for parameters of type int, double, string. > Not used yet for any of the variables. > > ---------------------------------------------------------------------- > For more details, visit http://www.fenics.org/hg/dolfin > _______________________________________________ > DOLFIN-dev mailing list > [email protected] > http://www.fenics.org/mailman/listinfo/dolfin-dev > _______________________________________________ DOLFIN-dev mailing list [email protected] http://www.fenics.org/mailman/listinfo/dolfin-dev
