[ntp:bk-ntp-dev-send] BitKeeper patch

Fri Jun 27 01:41:46 PDT 2003

This BitKeeper patch contains the following changesets:
stenn at whimsy.udel.edu|ChangeSet|20030627083608|03810
stenn at whimsy.udel.edu|ChangeSet|20030627084018|55003

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# ID:	stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
# User:	stenn
# Host:	whimsy.udel.edu
# Root:	/backroom/ntp-dev

#
#--- 1.12.1.21/Makefile.am	Sat Jun  7 04:33:53 2003
#+++ 1.41/Makefile.am	Fri Jun 27 04:40:14 2003
#@@ -5,20 +5,22 @@
# 	scripts \
# 	include \
# 	ElectricFence	\
#-	librsaref	\
#+	@ARLIB_DIR@ \
# 	libntp	\
# 	libparse	\
# 	ntpd	\
# 	ntpdate	\
# 	ntpdc	\
# 	ntpq	\
#-	ntptrace	\
# 	parseutil	\
# 	adjtimed	\
# 	clockstuff	\
# 	kernel	\
#+	@MAKE_SNTP@	\
# 	util
# 
#+DIST_SUBDIRS = $(SUBDIRS) ntptrace
#+
# EXTRA_DIST = \
# 	COPYRIGHT \
# 	ChangeLog \
#@@ -26,11 +28,9 @@
# 	NEWS \
# 	NOTES.y2kfixes \
# 	README.bk \
#-	README.cvs \
#-	README.des \
# 	README.hackers \
#+	README.patches \
# 	README.refclocks \
#-	README.rsa \
# 	README.versions \
# 	TODO \
# 	WHERE-TO-START \
#@@ -42,11 +42,11 @@
# 	excludes \
# 	flock-build \
# 	install-sh \
#-	ntp_update \
# 	readme.y2kfixes \
# 	results.y2kfixes \
# 	conf \
# 	html \
#+	libisc \
# 	ports \
# 	version
# 
#@@ -61,8 +61,8 @@
# # HMS: Keep .warning first, as that way it gets printed first.
# BUILT_SOURCES = .warning $(srcdir)/COPYRIGHT $(srcdir)/version
# 
#-$(srcdir)/COPYRIGHT: $(srcdir)/html/copyright.htm
#-	( echo "This file is automatically generated from html/copyright.htm" ; lynx -dump $(srcdir)/html/copyright.htm ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
#+$(srcdir)/COPYRIGHT: $(srcdir)/html/copyright.html
#+	( echo "This file is automatically generated from html/copyright.html" ; lynx -dump $(srcdir)/html/copyright.html ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
# 
# # HMS: The next bit is still suboptimal.  If bk is present but this NTP
# # repo is not a bk repo, we'll get an error message from the prs command.
#
#--- 1.8/README.hackers	Tue Jun 10 03:04:14 2003
#+++ 1.9/README.hackers	Fri Jun 27 04:35:39 2003
#@@ -24,41 +24,3 @@
# and NEVER appear in the .c files.
# 
# ---
#-
#-If you are going to patch both ntp-stable and ntp-dev
#-please do it this way:
#-
#- > cd ntp-stable
#- > (make and test your changes to ntp-stable first)
#- > (commit your changes to ntp-stable)
#- > cd ../ntp-dev
#- > bk pull ../ntp-stable	(get your changes from ntp-stable)
#- > (resolve any problems and test your changes)
#- > (commit your changes to ntp-dev)
#-
#-With the current release of bitkeeper it is *much* easier to move changes
#-from ntp-stable to ntp-dev than it is to move changes from ntp-dev to
#-ntp-stable.
#-
#-If you make your changes in the above order and then submit them,
#-it will be trivial to apply your patches.
#-
#-Otherwise, it will be much more difficult to apply your patches.
#-
#----
#-
#-Please read (and follow) the previous section if you want to submit
#-patches for both ntp-stable and ntp-dev.
#-
#-To submit patches please use the 'bk send' command:
#-
#- > cd REPO
#- > bk citool	(or bk ci ... ;  bk commit ... )
#- > bk pull	# make sure your repo is up-to-date
#- > bk send -d -ubk://www.ntp.org/home/bk/REPO - > file-containing-the-patch
#- > bk receive -vv -a < file-containing-the-patch
#-		# Sanity check.
#-
#- # Open a bugzilla item at <http://bugzilla.ntp.org>
#-
#- # After the bug is opened, visit the bug and attach file-containing-the-patch
#--- New file ---
#+++ README.patches	03/06/27 04:34:04
#If you are going to patch both ntp-stable and ntp-dev
#please do it this way:
#
# > cd ntp-stable
# > (make and test your changes to ntp-stable first)
# > (commit your changes to ntp-stable)
# > cd ../ntp-dev
# > bk pull ../ntp-stable	(get your changes from ntp-stable)
# > (resolve any problems and test your changes)
# > (commit your changes to ntp-dev)
#
#With the current release of bitkeeper it is *much* easier to move changes
#from ntp-stable to ntp-dev than it is to move changes from ntp-dev to
#ntp-stable.
#
#If you make your changes in the above order and then submit them,
#it will be trivial to apply your patches.
#
#Otherwise, it will be much more difficult to apply your patches.
#
#---
#
#Please read (and follow) the previous section if you want to submit
#patches for both ntp-stable and ntp-dev.
#
#To submit patches please use the 'bk send' command:
#
# > cd REPO
# > bk citool	(or bk ci ... ;  bk commit ... )
# > bk pull	# make sure your repo is up-to-date
# > bk send -d -ubk://www.ntp.org/home/bk/REPO - > file-containing-the-patch
# > bk receive -vv -a < file-containing-the-patch
#		# Sanity check.
#
# # Open a bugzilla item at <http://bugzilla.ntp.org>
#
# # After the bug is opened, visit the bug and attach file-containing-the-patch
#
#

# Diff checksum=9a1c6eb3

# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20030624073813|58596
D 1.683.14.30 03/06/27 04:36:08-04:00 stenn at whimsy.udel.edu +3 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Move the "patching" info from README.hackers to README.patches.
K 3810
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|Makefile.am|19990526004810|01635|3aed0663 stenn at whimsy.udel.edu|Makefile.am|20030627083537|63965
> stenn at whimsy.udel.edu|README.hackers|19990526004812|01682|3e480692 stenn at whimsy.udel.edu|README.hackers|20030627083539|58910
> stenn at whimsy.udel.edu|README.patches|20030627083404|38645|6908ed2cf74d1ca9 stenn at whimsy.udel.edu|README.patches|20030627083405|41201

fredb at tautology.immanent.net|ChangeSet|20030625231811|44281
D 1.1088 03/06/27 04:40:18-04:00 stenn at whimsy.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge whimsy.udel.edu:/backroom/ntp-stable
c into whimsy.udel.edu:/backroom/ntp-dev
i stenn at whimsy.udel.edu|ChangeSet|20030627083608|03810
K 55003
M stenn at whimsy.udel.edu|ChangeSet|20030627083608|03810
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|Makefile.am|19990526004810|01635|3aed0663 stenn at whimsy.udel.edu|Makefile.am|20030627084014|63500

== Makefile.am ==
stenn at whimsy.udel.edu|Makefile.am|19990526004810|01635|3aed0663
stenn at whimsy.udel.edu|Makefile.am|20030607083353|62602
D 1.12.1.22 03/06/27 04:35:37-04:00 stenn at whimsy.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Move the "patching" info from README.hackers to README.patches.
K 63965
O -rw-rw-r--
P Makefile.am
------------------------------------------------

I31 1
	README.patches \

stenn at whimsy.udel.edu|Makefile.am|20030607083741|62137
D 1.41 03/06/27 04:40:14-04:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Auto merged
i stenn at whimsy.udel.edu|Makefile.am|20030627083537|63965
K 63500
M stenn at whimsy.udel.edu|Makefile.am|20030627083537|63965
O -rw-rw-r--
P Makefile.am
------------------------------------------------

== README.hackers ==
stenn at whimsy.udel.edu|README.hackers|19990526004812|01682|3e480692
stenn at whimsy.udel.edu|README.hackers|20030610070414|34585
D 1.9 03/06/27 04:35:39-04:00 stenn at whimsy.udel.edu +0 -38
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Move the "patching" info from README.hackers to README.patches.
K 58910
O -rw-rw-r--
P README.hackers
------------------------------------------------

D27 38

== README.patches ==
New file: README.patches
V 4

stenn at whimsy.udel.edu|README.patches|20030627083404|38645|6908ed2cf74d1ca9
D 1.0 03/06/27 04:34:04-04:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
c BitKeeper file /backroom/ntp-stable-129/README.patches
K 38645
P README.patches
R 6908ed2cf74d1ca9
X 0x821
------------------------------------------------

stenn at whimsy.udel.edu|README.patches|20030627083404|38645|6908ed2cf74d1ca9
D 1.1 03/06/27 04:34:04-04:00 stenn at whimsy.udel.edu +37 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
F 1
K 41201
O -rw-rw-r--
P README.patches
------------------------------------------------

I0 37
If you are going to patch both ntp-stable and ntp-dev
please do it this way:
\
 > cd ntp-stable
 > (make and test your changes to ntp-stable first)
 > (commit your changes to ntp-stable)
 > cd ../ntp-dev
 > bk pull ../ntp-stable	(get your changes from ntp-stable)
 > (resolve any problems and test your changes)
 > (commit your changes to ntp-dev)
\
With the current release of bitkeeper it is *much* easier to move changes
from ntp-stable to ntp-dev than it is to move changes from ntp-dev to
ntp-stable.
\
If you make your changes in the above order and then submit them,
it will be trivial to apply your patches.
\
Otherwise, it will be much more difficult to apply your patches.
\
---
\
Please read (and follow) the previous section if you want to submit
patches for both ntp-stable and ntp-dev.
\
To submit patches please use the 'bk send' command:
\
 > cd REPO
 > bk citool	(or bk ci ... ;  bk commit ... )
 > bk pull	# make sure your repo is up-to-date
 > bk send -d -ubk://www.ntp.org/home/bk/REPO - > file-containing-the-patch
 > bk receive -vv -a < file-containing-the-patch
		# Sanity check.
\
 # Open a bugzilla item at <http://bugzilla.ntp.org>
\
 # After the bug is opened, visit the bug and attach file-containing-the-patch

# Patch checksum=80de868e