After a few painful rebases we switched to doing snapshots from a known good point and focused our efforts on that branch for a while until we got the snapshots part stable. Only after we had online snapshots at a known good point we started remerging with trunk. It took a bit of of time reconciling and hardening against the periodic merges before the merge into the the trunk branch. We had reviews on the merges too if I recall -- this way all the changes could be taken into account, all patches got reviewed, and each commits was compilable and testable.
Snapshots however was a fairly isolated feature. Jon. On Wed, Feb 19, 2014 at 6:26 PM, Enis Söztutar <[email protected]> wrote: > Sounds good. > > We had a working branch for HBASE-10070 in github (that is also publicized > this way), and now we moved to an svn branch so that commits are going to > that branch after reviews in jira. We also have hbase-10070 release tag in > jira for assigning fix versions to issues while resolving them. This has > worked so far. > > The most painful thing is to rebase the patches, because the base patches > change because of review comments, but it is not unmanageable. > > Enis > > > On Wed, Feb 19, 2014 at 6:17 PM, Andrew Purtell <[email protected]> > wrote: > > > On Wed, Feb 19, 2014 at 5:35 PM, Nick Dimiduk <[email protected]> > wrote: > > > > > I would also recommend you take an aggressive stance on rebasing this > > > branch onto trunk to keep things fresh. You'll need to work out the > > details > > > with your collaborators though. > > > > > > > Agreed. I'd like to ultimately keep the work apart as a stack of patches > > floating atop HBase trunk, rather than have a bunch of small commits with > > poorly descriptive commit messages threaded throughout branch history. > > Maybe a weekly Sunday rebase (perhaps with squashing) and force push > would > > not be too onerous. > > > > -- > > Best regards, > > > > - Andy > > > > Problems worthy of attack prove their worth by hitting back. - Piet Hein > > (via Tom White) > > > -- // Jonathan Hsieh (shay) // HBase Tech Lead, Software Engineer, Cloudera // [email protected] // @jmhsieh
