19c2daa00SOllivier RobertSee README.hackers for notes on coding styles. 29c2daa00SOllivier Robert 3ea906c41SOllivier RobertThe master copy of this information can be found at: 4ea906c41SOllivier Robert 5eb6d21b4SOllivier Robert http://support.ntp.org/Dev/MaintainerIssues#How_to_work_on_a_bug_using_BitKe 6ea906c41SOllivier Robert 79c2daa00SOllivier RobertIf you are going to patch both ntp-stable and ntp-dev 89c2daa00SOllivier Robertplease do it this way: 99c2daa00SOllivier Robert 109c2daa00SOllivier Robert > cd ntp-stable 119c2daa00SOllivier Robert > (make and test your changes to ntp-stable first) 129c2daa00SOllivier Robert > (commit your changes to ntp-stable) 139c2daa00SOllivier Robert > cd ../ntp-dev 149c2daa00SOllivier Robert > bk pull ../ntp-stable (get your changes from ntp-stable) 159c2daa00SOllivier Robert > (resolve any problems and test your changes) 169c2daa00SOllivier Robert > (commit your changes to ntp-dev) 179c2daa00SOllivier Robert 189c2daa00SOllivier RobertWith the current release of bitkeeper it is *much* easier to move changes 199c2daa00SOllivier Robertfrom ntp-stable to ntp-dev than it is to move changes from ntp-dev to 209c2daa00SOllivier Robertntp-stable. 219c2daa00SOllivier Robert 229c2daa00SOllivier RobertIf you make your changes in the above order and then submit them, 239c2daa00SOllivier Robertit will be trivial to apply your patches. 249c2daa00SOllivier Robert 259c2daa00SOllivier RobertOtherwise, it will be much more difficult to apply your patches. 269c2daa00SOllivier Robert 27ea906c41SOllivier RobertYou are pretty much done now if your repos are on pogo.udel.edu. 28ea906c41SOllivier Robert 29ea906c41SOllivier RobertIf these patches are for a bugzilla issue, mark the issue as Resolved/READY 30ea906c41SOllivier Robertwith a comment of "Please pick up the patches in pogo:/wherever" 31ea906c41SOllivier Robert 329c2daa00SOllivier Robert--- 339c2daa00SOllivier Robert 349c2daa00SOllivier RobertPlease read (and follow) the previous section if you want to submit 359c2daa00SOllivier Robertpatches for both ntp-stable and ntp-dev. 369c2daa00SOllivier Robert 37ea906c41SOllivier RobertIf you cannot easily get your patches to pogo, you may submit patches 38ea906c41SOllivier Robertvia the 'bk send' command: 399c2daa00SOllivier Robert 409c2daa00SOllivier Robert > cd REPO 419c2daa00SOllivier Robert > bk citool (or bk ci ... ; bk commit ... ) 429c2daa00SOllivier Robert > bk pull # make sure your repo is up-to-date 439c2daa00SOllivier Robert > bk send -d -ubk://www.ntp.org/home/bk/REPO - > file-containing-the-patch 449c2daa00SOllivier Robert > bk receive -vv -a < file-containing-the-patch 459c2daa00SOllivier Robert # Sanity check. 469c2daa00SOllivier Robert 479c2daa00SOllivier Robert # Open a bugzilla item at <http://bugzilla.ntp.org> 489c2daa00SOllivier Robert 499c2daa00SOllivier Robert # After the bug is opened, visit the bug and attach file-containing-the-patch 50