Changes between Version 4 and Version 5 of how-to/puppet/workflow


Ignore:
Timestamp:
May 4, 2013, 9:08:13 PM (6 years ago)
Author:
Daniel Kahn Gillmor
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • how-to/puppet/workflow

    v4 v5  
    55Fortunately, you can still only publish tested commits.
    66
    7  * Open two terminals. On terminal 0, ssh as root@roach. On terminal 1, cd into your puppet/confdir
     7 * Open two terminals. On terminal 0, ssh as `root@roach`. On terminal 1, cd into your puppet/confdir
    88 * On terminal 1, make changes, git add them, and git commit them.
    9  * On terminal 1, git push roach master
    10  * If they succeed, then you are done. You can git push mfpl to publish your changes.
     9 * On terminal 1, `git push roach master`
     10 * If they succeed, then you are done. You can `git push mfpl` to publish your changes.
    1111 * If they fail:
    1212  * Make additional changes in terminal 1
    1313  * git add the files you modified
    14   * git commit --amend
     14  * `git commit --amend`
    1515  * Optionally change your commit message (or just save the existing one)
    16   * On roach, run freepuppet-init (that erases your existing git repo, and builds a new empty one so your previosly pushed commit is no longer there).
     16  * On roach, run `freepuppet-init` (that erases your existing git repo, and builds a new empty one so your previously pushed commit is no longer there).
    1717  * On your workstation, run `git push roach master`
    1818 * Repeat as needed.