Jeff Smith writes:
> On Wednesday 07 February 2007 16:16, James Oltmans wrote:
> > We're going to have multiple project teams working on various bugs
> > in various states of funding and completion. The final product is
> > supposed to be kept in near pristine condition at all times. I
> > don't think we can manage this by just allowing everyone to commit
> > to the trunk and tag releases for testing purposes. I think each
> > project might need its own branch where the users can work without
> > being getting tripped up by other projects. Then when the project's
> > done merge the latest from the trunk to the project branch and test
> > a build off of there until it's approved for being merged into the
> > trunk (this would basically be a strategy to make each project a
> > single pre-tested commit to the trunk).
>
> Good start, except be careful about "two-way merging". In other words
> if a team has merged trunk changes to their branch, later they would
> not want to merge the same changes back to the trunk or the change
> would conflict with itself.
So long as you tag the trunk each time you merge from it (so that the
differences between the branch and the trunk tag are only branch
changes), there's no problem merging both ways.
Thomas Wicklund
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 8 20:49:05 2007