1*abb0f93cSkardelSee README.hackers for notes on coding styles. 2*abb0f93cSkardel 3*abb0f93cSkardelThe master copy of this information can be found at: 4*abb0f93cSkardel 5*abb0f93cSkardel http://support.ntp.org/Dev/MaintainerIssues#How_to_work_on_a_bug_using_BitKe 6*abb0f93cSkardel 7*abb0f93cSkardelIf you are going to patch both ntp-stable and ntp-dev 8*abb0f93cSkardelplease do it this way: 9*abb0f93cSkardel 10*abb0f93cSkardel > cd ntp-stable 11*abb0f93cSkardel > (make and test your changes to ntp-stable first) 12*abb0f93cSkardel > (commit your changes to ntp-stable) 13*abb0f93cSkardel > cd ../ntp-dev 14*abb0f93cSkardel > bk pull ../ntp-stable (get your changes from ntp-stable) 15*abb0f93cSkardel > (resolve any problems and test your changes) 16*abb0f93cSkardel > (commit your changes to ntp-dev) 17*abb0f93cSkardel 18*abb0f93cSkardelWith the current release of bitkeeper it is *much* easier to move changes 19*abb0f93cSkardelfrom ntp-stable to ntp-dev than it is to move changes from ntp-dev to 20*abb0f93cSkardelntp-stable. 21*abb0f93cSkardel 22*abb0f93cSkardelIf you make your changes in the above order and then submit them, 23*abb0f93cSkardelit will be trivial to apply your patches. 24*abb0f93cSkardel 25*abb0f93cSkardelOtherwise, it will be much more difficult to apply your patches. 26*abb0f93cSkardel 27*abb0f93cSkardelYou are pretty much done now if your repos are on pogo.udel.edu. 28*abb0f93cSkardel 29*abb0f93cSkardelIf these patches are for a bugzilla issue, mark the issue as Resolved/READY 30*abb0f93cSkardelwith a comment of "Please pick up the patches in pogo:/wherever" 31*abb0f93cSkardel 32*abb0f93cSkardel--- 33*abb0f93cSkardel 34*abb0f93cSkardelPlease read (and follow) the previous section if you want to submit 35*abb0f93cSkardelpatches for both ntp-stable and ntp-dev. 36*abb0f93cSkardel 37*abb0f93cSkardelIf you cannot easily get your patches to pogo, you may submit patches 38*abb0f93cSkardelvia the 'bk send' command: 39*abb0f93cSkardel 40*abb0f93cSkardel > cd REPO 41*abb0f93cSkardel > bk citool (or bk ci ... ; bk commit ... ) 42*abb0f93cSkardel > bk pull # make sure your repo is up-to-date 43*abb0f93cSkardel > bk send -d -ubk://www.ntp.org/home/bk/REPO - > file-containing-the-patch 44*abb0f93cSkardel > bk receive -vv -a < file-containing-the-patch 45*abb0f93cSkardel # Sanity check. 46*abb0f93cSkardel 47*abb0f93cSkardel # Open a bugzilla item at <http://bugzilla.ntp.org> 48*abb0f93cSkardel 49*abb0f93cSkardel # After the bug is opened, visit the bug and attach file-containing-the-patch 50