On Sun, Feb 13, 2011 at 2:29 PM, Mark A. Hershberger < [email protected]> wrote:
> > The problem with our current VCS is the sort of work-flow that has > developed around it. > > But we can solve the work-flow problem without introducing an entirely > new VCS and disrupting everything for a month or so while people adjust > to the new system. > > The solution I'm proposing is that we branch 1.18 immediately after the > release of the 1.17 tarball. > > Revisions marked “OK” (or, perhaps, tagged “118”) on the trunk could be > merged to the 1.18 branch. Or, to make merging into 1.18 less of a > chore for a single person, we could enable those doing code review to > merge code they've reviewed into the 1.18 branch. In this way, we > achieve Roan's (and my) goal of continuous integration. > If by this you suggest that 1.18 will be Wikimedia's actual live deployment branch, and that it should always be within a day or two's commits from trunk, then I can get down with that. -- brion _______________________________________________ Wikitech-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikitech-l
