[bt-devel] MDI Style ToolBars

[Eeli Kaikkonen]

On Mon, 22 Feb 2010, Gary Holmlund wrote:
> I was planning more testing before merging with the trunk. I did a lot
> of testing on various parts as I went along. The function to switch
> between the two locations was the last I implemented. I guess I got a
> little anxious for feedback and did not test it as much as I should
> have. I have corrected the problem you found.
>
> I have also changed the default to have the toolbars in the text
> windows. I have pushed these changes to the bazaar branch.

Good! I will look at it later.

About bzr merging: I think it's better to merge from trunk to your devel
branch every now and then, not only once at the end of the development
of a branch. Also, If you don't merge from trunk before publishing your
branch and there are potential conflicts between your branch and trunk,
every one who pulls from your branch must merge with trunk and resolve
the conflicts (if they want to keep up with both trunk and your branch,
that is). It may be even impossible if the developers doesn't know why
you have changed something and why someone else has changed something in
the same place - resolving conflicts requires knowledge. Therefore it's
much better if the one developer who knows about the changes merges and
resolves. In this specific case it doesn't matter much because there are
no conflicts, I think.

  Yours,
	Eeli Kaikkonen (Mr.), Oulu, Finland
	e-mail: eekaikko at mailx.studentx.oulux.fix (with no x)