[Scons-dev] Workflow

[Managan, Rob]

Gary,

Sorry to pester you but for clarity I wanted to split my recent work into
two pull requests. The first I have already created the pull request for.
It adds support for a new latex package, biblatex. The second part is to
allow the user to use biber instead of biblatex with env['BIBTEX'] =
'biber'; which requires the builder to know about side effects with
different extensions....

I pushed a commit with the second set of changes up to the same fork. If I
click on create pull request it says it will modify the first one. I
supposeI should wait and let you accept the first one and then create a
new pull request? Or should I not worry about keeping the two related bits
in separate updates to the main default branch??

Any ideas? 

Rob




On 6/14/12 9:28 AM, "Gary Oberbrunner" <garyo at oberbrunner.com> wrote:


>On Thu, Jun 14, 2012 at 11:34 AM, Managan, Rob <managan1 at llnl.gov> wrote:

>> I need a refresher on what the best workflow is for small changes.

>>

>> In the emails from Martin Geisler around May 8 2012 it sounded like we

>>were

>> going away from named branches for small simple additions.

>>

>> I am not seeing any changes yet

>> on http://scons.org/wiki/SconsMercurialWorkflows and was not quite sure

>>what

>> the procedure is.

>

>I did update it a few weeks ago:

>

>"Then to work on a bug or feature the simplest thing is to work

>directly on the default branch. Feature branches are not usually

>needed except for long-term development, but you're welcome to work

>that way if you like. You can just make your changes (including doc

>and tests); when you're happy, commit them, and push:"

>


*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-
Rob Managan                             email managan at llnl.gov
LLNL                                             phone: 925-423-0903
P.O. Box 808, L-095                   FAX:   925-422-3389
Livermore, CA  94551-0808