Hello Joel, On Thu, Jun 11, 2009 at 9:39 AM, Joel Granados<[email protected]> wrote: > I would like to add, that whenever we branch maint, we take care to add > two bug fixes that did not get added to master because of possible > conflicts down the road with next. > * http://lists.alioth.debian.org/pipermail/parted-devel/2009-June/002928.html > * http://lists.alioth.debian.org/pipermail/parted-devel/2009-June/002925.html
I think those ought to be commited in master right now and, if they conflict with something in next, we can revert then there and fix those bugs there in another way but waiting the maint branch is wrong IMO. I think that every bugfix that is suppose to be released need to be in master now so maint and master will be the same in release time. We'll diverge from maint when we pull next changes into it however bugfixes that are suppose to be released before 2.0 (1.9.1 for example) need to be commited in maint and we then merge maint into master. This way master can be merged back into maint easily (this was our fault in stable-1.8.x that made it too difficult to merge with). -- Otavio Salvador O.S. Systems E-mail: [email protected] http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br _______________________________________________ parted-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/parted-devel
