On Mar 25, 2009, at 3:29 PM, Todd Thiessen wrote:
Bob should work on a branch. IMHO if any work is taking a long time
and
you can't commit it to trunk in a timely manner, then do that work
on a
branch so you can commit often and still take specific control over
when
Alice's changes get merged to Bob's branch so he can test the merge
thoroughly before putting his changes in trunk.
This does not solve Bob's problem. Let's say he's committing to his
branch, and then at some point he merges Alice's changes to the trunk
into his branch. He then performs thorough testing of this new code
and encounters no problems. But of course he won't have any problems
testing the new Foo 2.2-SNAPSHOT because AppB is still still using the
old code from Foo 2.1-SNAPSHOT. Until he realizes that Foo's version
has changed, and he updates AppB accordingly, branching, merging, and
testing won't help him.
Trevor
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
