Re: Can't compile tip with eubins 02-16-11
- Posted by jimcbrown (admin) Feb 19, 2011
- 1148 views
The bug fixes that I have been posting to the 4.0 branch also go into the 4.1 branch (that is to say the 'trunk'). I don't know how it happens. Maybe it is automatic.
Shawn
No, the fixes for ticket:590 and ticket:608 that you did were merged into default from the 4.0 branch by Matt.
In general, it's ok to do the fix in the 4.0 branch only. anything in the 4.0 branch is guaranteed to be merged into the default branch periodicly (as any bug fixes for 4.0.1 should also go into 4.1), while the opposite is not suppose to happen (e.g. 4.1 changes should not be part of 4.0.1).
Actually, a big deal for having the default branch be the 4.1 branch and having 4.0.1 in a separate branch of its own is because it is easier to merge changes from a regular branch into default on a periodic basis, whereas having to merge default into another branch (and then later merging that branch back to default when its life is over) is more difficult.
(I'm sure hg handles that better than SVN though, where one has to merge a branch to trunk, closing it out, then create a brand-new branch from trunk with the same name.)
