The biggest problem I have is that before MariaDB, I have no prior experience using git. There is also no one here in Menlo Park who is a git expert. Jacob Jacob B. Mathew Senior Software Engineer MariaDB Corporation +1 408 655 8999 (mobile) jacob.b.mathew (Skype) jacob.mathew@MariaDB.com On Tue, Mar 21, 2017 at 12:11 AM, Sergei Golubchik <serg@mariadb.org> wrote:
Hi, Jacob!
On Mar 20, Jacob Mathew wrote:
Hi Sergei,
Both the changes for this bug and the changes for MDEV-10355 are in a stage tree named bb-10.2-<bug number>. However, when I look at the automated testing on their respective branches, I see a few failures. As far as I can tell, none of the failures could have been caused by my changes To give meaning to these results, I need a baseline for comparison for each branch. The respective baselines would be from just before I cloned each branch. Since I don't have those, I don't have any baselines for comparison, and so the test results are meaningless. How would you suggest I proceed?
You'll need to squash your commits (both for this bug and the changes for MDEV-10355) and rebase on top of 10.2 anyway.
Why not do it now? When you push the rebased bugfix back into your bb-10.2-<bug number> branch you'll have 10.2 as a baseline.
Regards, Sergei Chief Architect MariaDB and security@mariadb.org