On Dec 3, 2009, at 5:18 AM, Scott Gray wrote:

> On 4/12/2009, at 1:05 AM, Hans Bakker wrote:
> 
>> If you want to review these commits why not check them in the birt
>> branch...there they are separated.
> 
> I'm not so concerned about myself but more for others and in particular 
> people looking at the commit history in the future.
> The integration and the examples are completely different subject matters are 
> should be treated as such when committing to the trunk regardless of how 
> they've been committed to the branch.

How would one separate them when committing them to the trunk?

Typically merging a branch with the trunk involves a single commit in order to 
keep it simple. It doesn't have to be that way, but it nice to simply say 
branch rev X was merged into the trunk at trunk rev Y.

-David

Reply via email to