Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
staging [2009/11/22 20:23]
mdc
staging [2010/01/15 13:00] (current)
stefanha
Line 173: Line 173:
 === Indicating readiness for final merge review === === Indicating readiness for final merge review ===
  
-When a sponsor believes that an appropriate window of opportunity for review has expired, they may then rename their branch ​in the staging repository in the following format:+When a sponsor believes that an appropriate window of opportunity for review has expired, they may send a pull request email to staging@etherboot.org. ​ This is an indication to main branch ​maintainers that the feature is now ready for final merge review.
  
-    sponsor_name-task_number-feature_branch_name-ready+The email subject should be as follows:
  
-This is an indication to main branch maintainers that the feature is now ready for final merge review.+    [PULL REQUEST] sponsor_name-task_number-feature_branch_name 
 + 
 +The pull request email message can be generated as follows: 
 + 
 +    $ # Currently on the staging branch 
 +    $ git request-pull master git://​git.etherboot.org/​scm/​gpxe-staging.git
  
 Note to staging tree maintainers: ​ Note to staging tree maintainers: ​
Line 185: Line 190:
     $ git push staging local_name:​refs/​heads/​remote_name     $ git push staging local_name:​refs/​heads/​remote_name
  
-Main repository maintainers ​can easily check for branches pending ​final merge review ​with +Main repository maintainers ​respond to the pull request email by performing ​final review ​and merging ​the branch if it passes review.
- +
-    $ git branch -r -v | grep ready +
- +
-or by using gitweb to view all branches in the staging repository:​ +
- +
-    http://​git.etherboot.org/?​p=gpxe-staging.git;a=heads+
  
 === Final merge review procedure === === Final merge review procedure ===
Line 218: Line 217:
  
 === Ways to view the staging repository === === Ways to view the staging repository ===
 +
 +== View compact listing of remote branches ==
  
     $ git branch -r -v     $ git branch -r -v
 +
 +== Look at staging branch commits ==
 +
     $ git log staging/​branch_name     $ git log staging/​branch_name
  
-=== Show commits in staging branch not in main branch ​===+== Show commits in staging branch not in main branch ==
  
     $ git cherry -v HEAD staging/​branch_name     $ git cherry -v HEAD staging/​branch_name

Navigation

* [[:start|Home]] * [[:about|About our Project]] * [[:download|Download]] * [[:screenshots|Screenshots]] * Documentation * [[:howtos|HowTo Guides]] * [[:appnotes|Application Notes]] * [[:faq:|FAQs]] * [[:doc|General Doc]] * [[:talks|Videos, Talks, and Papers]] * [[:hardwareissues|Hardware Issues]] * [[:mailinglists|Mailing lists]] * [[http://support.etherboot.org/|Bugtracker]] * [[:contributing|Contributing]] * [[:editing_permission|Wiki Edit Permission]] * [[:wiki:syntax|Wiki Syntax]] * [[:contact|Contact]] * [[:relatedlinks|Related Links]] * [[:commerciallinks|Commercial Links]] * [[:acknowledgements|Acknowledgements]] * [[:logos|Logo Art]]

QR Code
QR Code staging (generated for current page)