From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 28 Feb 2003 09:52:34 +0000 (-0500)
Subject: How to patch ntp-stable and ntp-dev.
X-Git-Tag: NTP_4_1_1C_RC2~12^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf27e7831348f067aa9f974ef425f4dedd99e6de;p=thirdparty%2Fntp.git

How to patch ntp-stable and ntp-dev.

bk: 3e5f3162Y0eZz_g_Tu5lLoETV00GZQ
---

diff --git a/README.hackers b/README.hackers
index 532a13a8d1..20c2797d1c 100644
--- a/README.hackers
+++ b/README.hackers
@@ -25,6 +25,31 @@ 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