xref: /freebsd/contrib/ntp/README.patches (revision 9c2daa00)
19c2daa00SOllivier RobertSee README.hackers for notes on coding styles.
29c2daa00SOllivier Robert
39c2daa00SOllivier RobertThe master copy of this information can be found at:
49c2daa00SOllivier Robert
59c2daa00SOllivier Robert http://support.ntp.org/Dev/MaintainerIssues#How_to_work_on_a_bug_using_BitKe
69c2daa00SOllivier 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
279c2daa00SOllivier RobertYou are pretty much done now if your repos are on pogo.udel.edu.
289c2daa00SOllivier Robert
299c2daa00SOllivier RobertIf these patches are for a bugzilla issue, mark the issue as Resolved/READY
309c2daa00SOllivier Robertwith a comment of "Please pick up the patches in pogo:/wherever"
319c2daa00SOllivier 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
379c2daa00SOllivier RobertIf you cannot easily get your patches to pogo, you may submit patches
389c2daa00SOllivier Robertvia the 'bk send' command:
399c2daa00SOllivier Robert
40 > cd REPO
41 > bk citool	(or bk ci ... ;  bk commit ... )
42 > bk pull	# make sure your repo is up-to-date
43 > bk send -d -ubk://www.ntp.org/home/bk/REPO - > file-containing-the-patch
44 > bk receive -vv -a < file-containing-the-patch
45		# Sanity check.
46
47 # Open a bugzilla item at <http://bugzilla.ntp.org>
48
49 # After the bug is opened, visit the bug and attach file-containing-the-patch
50