> I once used CruiseControl.NET to automate a process very much like this for
> a C# .NET project. There were several parallel development projects going
> on, and they had to be done in separate branches so as not to conflict with
> each other. However, we didn't want integration problems when it came time
> to merge. I had CruiseControl.NET monitor checkins and autobuild each
> project as usual, but then after a successful build, it ran a custom NAnt
> task (that I wrote in C#) to merge the committed changes to an integration
> branch. A separate build process then built the integration branch to make
> sure that it wasn't broken. As long as the integration branch build wasn't
> broken, we knew that merging to the trunk down the road would be no problem.
> In addition, when changes were made to the trunk, I had a process merge them
> immediately to all of the custom branches.
How did you manage possible merge conflicts with an automated merge process?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Feb 19 23:28:18 2007