Re: [ jEdit-devel ] [ jEdit-commits ] SF.net SVN: jedit:[19158] jEdit/branches/4.4.x/org/gjt/sp/jedit/ GUIUtilities.java

[Alan E. <ez...@us...>]

The regression is not in trunk because I introduced a new option for
floatable toolbars, and I did not break up my changes properly as
separate commits on trunk, so the rev# that was merged was missing
something.

You think of this as a "dismissal" of the merge process, but I think
of it differently:  I am just correcting a mistake which got into 4.4
as a direct result of me trying to follow the process in the first
place.

On Tue, Dec 21, 2010 at 6:00 AM, Kazutoshi Satoda
<k_s...@f2...> wrote:
> ez...@us... wrote:
>>
>> Revision: 19158
>>           http://jedit.svn.sourceforge.net/jedit/?rev=19158&view=rev
>> Author:   ezust
>> Date:     2010-12-19 23:34:48 +0000 (Sun, 19 Dec 2010)
>>
>> Log Message:
>> -----------
>> Oops. Merging accidentally removed the setFloatable(false) from the
>> previous
>> revision, introdcing another regression.
>> I am re-adding it now.
>
> Then the regression is also in the trunk, isn't it?
>
> I really wonder why you could dismiss the merge process again.
> --
> k_satoda
>