> > Thanks for your answer. Our commits to /trunk are supposed to be > > done rarely. > > Basically we want to exclude source code of projects that for > some > > reasons cannot be built centrally (on the server where the > > repository > > is). > > A project consists of java files in a directory and an ant > script. > > Unfortunately I have not found any well-known software to help > with > > this kind of buildings. > > Team City supports pre-tested commits. from their web site: > > "With TeamCity you can build, check and run automated tests on the > server even before committing your changes - keeping your code base > clean at all times. Optionally, you can set up TeamCity to > automatically commit changes to your version control each time they > pass all checks." >
Another option would be to do all your development on a branch. Have you build scripts build from that branch. IF the build is successful perform a merge to trunk. If the build fails, don't do the merge. Since branch is never checked into there shouldn't be merge conflicts. (well, tree conflicts would still be possible.) BOb
