Opened 17 years ago

Closed 17 years ago

Last modified 17 years ago

#84 closed Task (fixed)

Merge [142] to trunk

Reported by: Frederico Caldeira Knabben Owned by: Alfonso Martínez de Lizarrondo
Priority: Normal Milestone: FCKeditor 2.4.1
Component: General Version:
Keywords: Cc:


The changeset [142] seams to be ok. It can be merged to trunk.

As a side note, I would recommend making a separated commit for each thing. For example, the above changeset could result in the following commits:

  • Merged trunk rXXX:139 into branches/developers/alfonsoml
  • Fixed SF bug 1659613 : Out of memory error in IE7+flash
  • Fixed SF bug 1660456 : context menus are selectable
  • Fixed SF bug 1653009 : asp error if set to process html files

The above separation makes each commit an isolate issue. It makes code review and merge tasks easy. For example, we may merge just one of those fixes to the trunk, or to a micro version (like 2.4.x).

Another note... for code that doesn't bring instability, there is no need to work on a separated branch. Go ahead directly to the trunk if you feel the code is ok and it is well tested. It makes the management easier.

I've enhanced the SVN page with related information... as always we are slowly creating our standards, step by step.

Change History (2)

comment:1 Changed 17 years ago by Alfonso Martínez de Lizarrondo

Resolution: fixed
Status: newclosed

Ok, I've merged each change as one commit.

comment:2 Changed 17 years ago by Frederico Caldeira Knabben

Milestone: FCKeditor 2.4FCKeditor 2.4.1
Note: See TracTickets for help on using tickets.
© 2003 – 2022, CKSource sp. z o.o. sp.k. All rights reserved. | Terms of use | Privacy policy