<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Hi,<div class=""><br class=""></div><div class="">I agree to the suggestion that the bugfix should also go into the stable branch.</div><div class=""><br class=""></div><div class=""><blockquote type="cite" class=""><div dir="ltr" class=""><div class="">as soon as a bugfix pull request to stable goes in, there should be an accompanying merge from the stable branch into the yt branch to ensure that both branches get bug fixes.</div></div></blockquote><br class=""></div><div class="">This is one possible way of doing it, so we can avoid the potential “mixing” of the new features in yt branch into the stable branch: <a href="http://stackoverflow.com/questions/7165989/mercurial-apply-a-bugfix-change-from-stable-named-branch-to-dev-branch" class="">http://stackoverflow.com/questions/7165989/mercurial-apply-a-bugfix-change-from-stable-named-branch-to-dev-branch</a></div><div class=""><br class=""></div><div class=""><br class=""></div><div class="">Best wishes,</div><div class=""><br class=""><div class="">
<div style="color: rgb(0, 0, 0); letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div style="color: rgb(0, 0, 0); letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div style="color: rgb(0, 0, 0); letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div style="color: rgb(0, 0, 0); letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div class="">--</div><div class="">Suoqing JI</div><div class="">Ph.D Student</div><div class="">Department of Physics</div><div class="">University of California, Santa Barbara</div><div class="">CA 93106, USA</div></div></div></div></div>
</div>
<br class=""><div><blockquote type="cite" class=""><div class="">On Jan 13, 2015, at 3:44 PM, Nathan Goldbaum <<a href="mailto:nathan12343@gmail.com" class="">nathan12343@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">Hi all,<div class=""><br class=""></div><div class="">Now that yt 3.1 is making its way out the door, I'd like to come back to a discussion we had last year about bugfixes.</div><div class=""><br class=""></div><div class="">I've made a pull request to the YTEP repository that summarized the change I'm proposing:</div><div class=""><br class=""></div><div class=""><a href="https://bitbucket.org/yt_analysis/ytep/pull-request/48/modify-ytep-1776-to-require-that-bugfixes/diff" class="">https://bitbucket.org/yt_analysis/ytep/pull-request/48/modify-ytep-1776-to-require-that-bugfixes/diff</a><br class=""></div><div class=""><br class=""></div><div class="">Basically, I think bugfixes need to go to the stable branch rather than the yt branch. Currently, all new changes go to the yt branch. While this does simplify our development practices, this makes it difficult for us to release new versions that only include fixes for bugs. Instead, even minor version releases that are cut from the yt branch include new features and API breakages.</div><div class=""><br class=""></div><div class="">I think this approach violates the principle of least surprise for users who have download a bugfix release.</div><div class=""><br class=""></div><div class="">The solution, I think, is to ensure bugfixes are only applied to the stable branch. This will ensure that we can straightforwardly do bugfix releases that inlude only bugfixes and that new features and API changes are isolated to the more "experimental" yt branch.</div><div class=""><br class=""></div><div class="">This does come with some possible down sides. In particular, there will likely be some confusion as we switch our development practices. In addition, new contributors may find it difficult to split pull requests into new features that should go to the yt branch and bugfixes that should go to the stable branch. It also adds a new maintenance burden: as soon as a bugfix pull request to stable goes in, there should be an accompanying merge from the stable branch into the yt branch to ensure that both branches get bugfixes. This gets more complicated if the bugfix looks different in the yt branch and the stable branch.</div><div class=""><br class=""></div><div class="">All that said, I think these new maintenance burdens can be overcome with a bit of vigilance and maybe some new tooling.</div><div class=""><br class=""></div><div class="">I've probably said enough about this. What do you all think? Comments and concerns are very welcome.</div><div class=""><br class=""></div><div class="">Best,</div><div class=""><br class=""></div><div class="">Nathan Goldbaum</div></div>
_______________________________________________<br class="">yt-dev mailing list<br class=""><a href="mailto:yt-dev@lists.spacepope.org" class="">yt-dev@lists.spacepope.org</a><br class="">http://lists.spacepope.org/listinfo.cgi/yt-dev-spacepope.org<br class=""></div></blockquote></div><br class=""></div></body></html>