[ntp:commitlogs] incoming pull in whimsy.udel.edu:/deacon/backroom/ntp-dev

Harlan Stenn stenn at whimsy.udel.edu
Sat Mar 3 16:39:58 PST 2007


VAR       CLIENT              SERVER              
===       ======              ======              
USER      stenn               stenn               
HOST      whimsy.udel.edu     whimsy.udel.edu     
ROOT      /deacon/backroom/ntp-dev/deacon/backroom/ntp-stable
LEVEL     1                   1                   
TIME_T    1165277347          1165277347          
UTC       20061205000907      20061205000907      
VERSION   bk-4.0.2            bk-4.0.2            

stenn at whimsy.udel.edu fired the post-incoming--010commitlogs trigger in /deacon/backroom/ntp-dev
    Received the following changesets
    
    ChangeSet at 1.1499, 2007-03-03 19:37:57-05:00, stenn at whimsy.udel.edu +26 -0
      Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
      into  whimsy.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.1436.1.34
    
      BitKeeper/deleted/.del-packageinfo.sh~9547f70d1df81d4 at 1.73, 2007-03-03 19:29:49-05:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.65.6.2
    
      BitKeeper/deleted/.del-packageinfo.sh~9547f70d1df81d4 at 1.65.6.2, 2007-03-03 19:29:46-05:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: packageinfo.sh -> BitKeeper/deleted/.del-packageinfo.sh~9547f70d1df81d4
    
      ChangeLog at 1.17, 2007-03-03 19:37:50-05:00, stenn at whimsy.udel.edu +1 -1
        Fix merge problem - keep -stable patches in the -stable section.
        MERGE: 1.1.1.9
    
      ntpd/ntpd-opts.c at 1.71, 2007-03-03 19:32:35-05:00, stenn at whimsy.udel.edu +0 -2
        MERGE: 1.50.1.5
    
      ntpd/ntpd-opts.h at 1.71, 2007-03-03 19:32:40-05:00, stenn at whimsy.udel.edu +0 -3
        MERGE: 1.50.1.5
    
      ntpd/ntpd-opts.texi at 1.70, 2007-03-03 19:32:44-05:00, stenn at whimsy.udel.edu +0 -1
        MERGE: 1.49.1.5
    
      ntpd/ntpd.1 at 1.69, 2007-03-03 19:32:47-05:00, stenn at whimsy.udel.edu +0 -2
        MERGE: 1.48.1.5
    
      ntpd/ntpdsim-opts.c at 1.71, 2007-03-03 19:32:50-05:00, stenn at whimsy.udel.edu +0 -2
        MERGE: 1.50.1.5
    
      ntpd/ntpdsim-opts.h at 1.71, 2007-03-03 19:32:53-05:00, stenn at whimsy.udel.edu +0 -3
        MERGE: 1.50.1.5
    
      ntpd/ntpdsim-opts.texi at 1.69, 2007-03-03 19:32:57-05:00, stenn at whimsy.udel.edu +0 -1
        MERGE: 1.48.1.5
    
      ntpd/ntpdsim.1 at 1.69, 2007-03-03 19:33:02-05:00, stenn at whimsy.udel.edu +0 -2
        MERGE: 1.48.1.5
    
      ntpdc/ntpdc-opts.c at 1.71, 2007-03-03 19:33:09-05:00, stenn at whimsy.udel.edu +0 -2
        MERGE: 1.50.1.5
    
      ntpdc/ntpdc-opts.h at 1.71, 2007-03-03 19:33:11-05:00, stenn at whimsy.udel.edu +0 -3
        MERGE: 1.50.1.5
    
      ntpdc/ntpdc-opts.texi at 1.69, 2007-03-03 19:33:15-05:00, stenn at whimsy.udel.edu +0 -1
        MERGE: 1.48.1.5
    
      ntpdc/ntpdc.1 at 1.69, 2007-03-03 19:33:18-05:00, stenn at whimsy.udel.edu +0 -2
        MERGE: 1.48.1.5
    
      ntpq/ntpq-opts.c at 1.73, 2007-03-03 19:33:21-05:00, stenn at whimsy.udel.edu +0 -2
        MERGE: 1.52.1.5
    
      ntpq/ntpq-opts.h at 1.73, 2007-03-03 19:33:23-05:00, stenn at whimsy.udel.edu +0 -3
        MERGE: 1.52.1.5
    
      ntpq/ntpq-opts.texi at 1.70, 2007-03-03 19:33:26-05:00, stenn at whimsy.udel.edu +0 -1
        MERGE: 1.49.1.5
    
      ntpq/ntpq.1 at 1.69, 2007-03-03 19:33:30-05:00, stenn at whimsy.udel.edu +0 -2
        MERGE: 1.48.1.5
    
      sntp/sntp-opts.c at 1.70, 2007-03-03 19:33:33-05:00, stenn at whimsy.udel.edu +0 -2
        MERGE: 1.49.1.5
    
      sntp/sntp-opts.h at 1.70, 2007-03-03 19:33:36-05:00, stenn at whimsy.udel.edu +0 -3
        MERGE: 1.49.1.5
    
      sntp/sntp-opts.texi at 1.67, 2007-03-03 19:33:39-05:00, stenn at whimsy.udel.edu +0 -1
        MERGE: 1.46.1.5
    
      sntp/sntp.1 at 1.70, 2007-03-03 19:33:42-05:00, stenn at whimsy.udel.edu +0 -2
        MERGE: 1.49.1.5
    
      util/ntp-keygen-opts.c at 1.70, 2007-03-03 19:33:45-05:00, stenn at whimsy.udel.edu +0 -2
        MERGE: 1.49.1.5
    
      util/ntp-keygen-opts.h at 1.70, 2007-03-03 19:33:50-05:00, stenn at whimsy.udel.edu +0 -3
        MERGE: 1.49.1.5
    
      util/ntp-keygen-opts.texi at 1.68, 2007-03-03 19:33:54-05:00, stenn at whimsy.udel.edu +0 -1
        MERGE: 1.47.1.5
    
      util/ntp-keygen.1 at 1.68, 2007-03-03 19:33:56-05:00, stenn at whimsy.udel.edu +0 -2
        MERGE: 1.47.1.5
    
    ChangeSet at 1.1436.1.34, 2007-03-03 19:21:29-05:00, stenn at whimsy.udel.edu +2 -0
      [Bug 793] Update Hans Lambermont's email address in ntpsweep
    
      ChangeLog at 1.1.1.9, 2007-03-03 19:21:16-05:00, stenn at whimsy.udel.edu +1 -0
        [Bug 793] Update Hans Lambermont's email address in ntpsweep
    
      scripts/ntpsweep.in at 1.3, 2007-03-03 19:21:17-05:00, stenn at whimsy.udel.edu +1 -2
        [Bug 793] Update Hans Lambermont's email address in ntpsweep
    
    ChangeSet at 1.1436.1.33, 2007-02-24 06:42:26-05:00, stenn at whimsy.udel.edu +25 -0
      NTP_4_2_4P0_RC5
      TAG: NTP_4_2_4P0_RC5
    
      packageinfo.sh at 1.65.6.1, 2007-02-24 06:42:17-05:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P0_RC5
    
      ntpd/ntpd-opts.c at 1.50.1.5, 2007-02-24 06:42:04-05:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P0_RC5
    
      ntpd/ntpd-opts.h at 1.50.1.5, 2007-02-24 06:42:05-05:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P0_RC5
    
      ntpd/ntpd-opts.texi at 1.49.1.5, 2007-02-24 06:42:06-05:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P0_RC5
    
      ntpd/ntpd.1 at 1.48.1.5, 2007-02-24 06:42:07-05:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P0_RC5
    
      ntpd/ntpdsim-opts.c at 1.50.1.5, 2007-02-24 06:42:08-05:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P0_RC5
    
      ntpd/ntpdsim-opts.h at 1.50.1.5, 2007-02-24 06:42:08-05:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P0_RC5
    
      ntpd/ntpdsim-opts.texi at 1.48.1.5, 2007-02-24 06:42:09-05:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P0_RC5
    
      ntpd/ntpdsim.1 at 1.48.1.5, 2007-02-24 06:42:10-05:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P0_RC5
    
      ntpdc/ntpdc-opts.c at 1.50.1.5, 2007-02-24 06:42:11-05:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P0_RC5
    
      ntpdc/ntpdc-opts.h at 1.50.1.5, 2007-02-24 06:42:11-05:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P0_RC5
    
      ntpdc/ntpdc-opts.texi at 1.48.1.5, 2007-02-24 06:42:12-05:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P0_RC5
    
      ntpdc/ntpdc.1 at 1.48.1.5, 2007-02-24 06:42:13-05:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P0_RC5
    
      ntpq/ntpq-opts.c at 1.52.1.5, 2007-02-24 06:42:13-05:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P0_RC5
    
      ntpq/ntpq-opts.h at 1.52.1.5, 2007-02-24 06:42:14-05:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P0_RC5
    
      ntpq/ntpq-opts.texi at 1.49.1.5, 2007-02-24 06:42:15-05:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P0_RC5
    
      ntpq/ntpq.1 at 1.48.1.5, 2007-02-24 06:42:16-05:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P0_RC5
    
      sntp/sntp-opts.c at 1.49.1.5, 2007-02-24 06:42:17-05:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P0_RC5
    
      sntp/sntp-opts.h at 1.49.1.5, 2007-02-24 06:42:18-05:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P0_RC5
    
      sntp/sntp-opts.texi at 1.46.1.5, 2007-02-24 06:42:18-05:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P0_RC5
    
      sntp/sntp.1 at 1.49.1.5, 2007-02-24 06:42:19-05:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P0_RC5
    
      util/ntp-keygen-opts.c at 1.49.1.5, 2007-02-24 06:42:20-05:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P0_RC5
    
      util/ntp-keygen-opts.h at 1.49.1.5, 2007-02-24 06:42:21-05:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P0_RC5
    
      util/ntp-keygen-opts.texi at 1.47.1.5, 2007-02-24 06:42:21-05:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P0_RC5
    
      util/ntp-keygen.1 at 1.47.1.5, 2007-02-24 06:42:22-05:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P0_RC5
    


More information about the commitlogs mailing list