Stable branch vs trunk?

[clebert.suconic]

When we make commits on the stable branch, should we also manually apply those fixes on trunk, or do it in batches?

IMO: I'm more favorable of each fix on stable->same fix on trunk... so each one cleans after his own mess :-) than later having a single person dealing with merge problems.


Any ideas or comments?

[clebert.suconic]

IMO: I'm more favorable of each fix on stable->same fix on trunk... so each one cleans after his own mess :-) than later having a single person dealing with merge problems.

Well... my other personality thinks there is one advantage about merging in batches... you only merge code after releases.. what means.. less chance of making mistakes.

Anyway... I just wanted to start the discussion.

[timfox]

I agree with your first personality - each person should make sure their changes are committed on both branches.

Actually this is what I have already done.

[timfox]

Also - and this critical - *please, please* make sure the merge history is updated when you do a merge:

http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossMessagingMergingActivity

I notice that not everyone is doing this! You know who you are :)

If you don't update this page it just screws it for the next person when they come to do a merge and end up re-merging the same stuff.