From: David P G. <gr...@us...> - 2007-06-25 21:33:48
|
Just to be clear, I don't think there's anything wrong with 12812 and 12813 as a change. But, the right way to do this kind of change is to commit to the trunk and then merge the trunk to the branch. It takes a little initial setup to have both repositories and a few minutes of extra work, but (1) it keeps the branch more focused and (2) by doing incremental merges from trunk to branch you make it easier to manage the final merge back. I spend a lot of time doing multi-stream development and I understand it can be a little cumbersome, but dealing with this incrementally is really much better than letting changesets accumulate. --dave |