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

Harlan Stenn stenn at whimsy.udel.edu
Wed May 30 14:55:09 PDT 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    1179349933          1179349933          
UTC       20070516211213      20070516211213      
VERSION   bk-4.0.2c           bk-4.0.2c           

stenn at whimsy.udel.edu fired the post-incoming--010commitlogs trigger in /deacon/backroom/ntp-dev
    Received the following changesets
    
    ChangeSet at 1.1502, 2007-05-30 17:52:26-04:00, stenn at whimsy.udel.edu +25 -0
      Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
      into  whimsy.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.1436.1.54
    
      BitKeeper/deleted/.del-ntp-keygen-opts.c at 1.77, 2007-05-30 17:51:13-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.6.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.c at 1.49.6.2, 2007-05-30 17:50:53-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: util/ntp-keygen-opts.c -> BitKeeper/deleted/.del-ntp-keygen-opts.c
    
      BitKeeper/deleted/.del-ntp-keygen-opts.h at 1.77, 2007-05-30 17:51:15-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.6.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.h at 1.49.6.2, 2007-05-30 17:50:54-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: util/ntp-keygen-opts.h -> BitKeeper/deleted/.del-ntp-keygen-opts.h
    
      BitKeeper/deleted/.del-ntp-keygen-opts.texi at 1.75, 2007-05-30 17:51:18-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.47.6.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.texi at 1.47.6.2, 2007-05-30 17:50:55-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: util/ntp-keygen-opts.texi -> BitKeeper/deleted/.del-ntp-keygen-opts.texi
    
      BitKeeper/deleted/.del-ntp-keygen.1 at 1.75, 2007-05-30 17:51:19-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.47.6.2
    
      BitKeeper/deleted/.del-ntp-keygen.1 at 1.47.6.2, 2007-05-30 17:50:57-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: util/ntp-keygen.1 -> BitKeeper/deleted/.del-ntp-keygen.1
    
      BitKeeper/deleted/.del-ntpd-opts.c at 1.78, 2007-05-30 17:51:21-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.6.2
    
      BitKeeper/deleted/.del-ntpd-opts.c at 1.50.6.2, 2007-05-30 17:50:48-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpd/ntpd-opts.c -> BitKeeper/deleted/.del-ntpd-opts.c
    
      BitKeeper/deleted/.del-ntpd-opts.h at 1.78, 2007-05-30 17:51:24-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.6.2
    
      BitKeeper/deleted/.del-ntpd-opts.h at 1.50.6.2, 2007-05-30 17:50:59-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpd/ntpd-opts.h -> BitKeeper/deleted/.del-ntpd-opts.h
    
      BitKeeper/deleted/.del-ntpd-opts.texi at 1.77, 2007-05-30 17:51:26-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.6.2
    
      BitKeeper/deleted/.del-ntpd-opts.texi at 1.49.6.2, 2007-05-30 17:51:00-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpd/ntpd-opts.texi -> BitKeeper/deleted/.del-ntpd-opts.texi
    
      BitKeeper/deleted/.del-ntpd.1 at 1.76, 2007-05-30 17:51:28-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.6.2
    
      BitKeeper/deleted/.del-ntpd.1 at 1.48.6.2, 2007-05-30 17:51:02-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpd/ntpd.1 -> BitKeeper/deleted/.del-ntpd.1
    
      BitKeeper/deleted/.del-ntpdc-opts.c at 1.78, 2007-05-30 17:51:30-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.6.2
    
      BitKeeper/deleted/.del-ntpdc-opts.c at 1.50.6.2, 2007-05-30 17:50:33-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpdc/ntpdc-opts.c -> BitKeeper/deleted/.del-ntpdc-opts.c
    
      BitKeeper/deleted/.del-ntpdc-opts.h at 1.78, 2007-05-30 17:51:32-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.6.2
    
      BitKeeper/deleted/.del-ntpdc-opts.h at 1.50.6.2, 2007-05-30 17:50:35-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpdc/ntpdc-opts.h -> BitKeeper/deleted/.del-ntpdc-opts.h
    
      BitKeeper/deleted/.del-ntpdc-opts.texi at 1.76, 2007-05-30 17:51:35-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.6.2
    
      BitKeeper/deleted/.del-ntpdc-opts.texi at 1.48.6.2, 2007-05-30 17:50:36-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpdc/ntpdc-opts.texi -> BitKeeper/deleted/.del-ntpdc-opts.texi
    
      BitKeeper/deleted/.del-ntpdc.1 at 1.76, 2007-05-30 17:51:36-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.6.2
    
      BitKeeper/deleted/.del-ntpdc.1 at 1.48.6.2, 2007-05-30 17:50:38-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpdc/ntpdc.1 -> BitKeeper/deleted/.del-ntpdc.1
    
      BitKeeper/deleted/.del-ntpdsim-opts.c at 1.78, 2007-05-30 17:51:37-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.6.2
    
      BitKeeper/deleted/.del-ntpdsim-opts.c at 1.50.6.2, 2007-05-30 17:51:04-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpd/ntpdsim-opts.c -> BitKeeper/deleted/.del-ntpdsim-opts.c
    
      BitKeeper/deleted/.del-ntpdsim-opts.h at 1.78, 2007-05-30 17:51:40-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.6.2
    
      BitKeeper/deleted/.del-ntpdsim-opts.h at 1.50.6.2, 2007-05-30 17:51:06-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpd/ntpdsim-opts.h -> BitKeeper/deleted/.del-ntpdsim-opts.h
    
      BitKeeper/deleted/.del-ntpdsim-opts.texi at 1.76, 2007-05-30 17:51:43-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.6.2
    
      BitKeeper/deleted/.del-ntpdsim-opts.texi at 1.48.6.2, 2007-05-30 17:51:08-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpd/ntpdsim-opts.texi -> BitKeeper/deleted/.del-ntpdsim-opts.texi
    
      BitKeeper/deleted/.del-ntpdsim.1 at 1.76, 2007-05-30 17:51:45-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.6.2
    
      BitKeeper/deleted/.del-ntpdsim.1 at 1.48.6.2, 2007-05-30 17:51:10-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpd/ntpdsim.1 -> BitKeeper/deleted/.del-ntpdsim.1
    
      BitKeeper/deleted/.del-ntpq-opts.c at 1.80, 2007-05-30 17:51:47-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.52.6.2
    
      BitKeeper/deleted/.del-ntpq-opts.c at 1.52.6.2, 2007-05-30 17:50:39-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpq/ntpq-opts.c -> BitKeeper/deleted/.del-ntpq-opts.c
    
      BitKeeper/deleted/.del-ntpq-opts.h at 1.80, 2007-05-30 17:51:49-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.52.6.2
    
      BitKeeper/deleted/.del-ntpq-opts.h at 1.52.6.2, 2007-05-30 17:50:40-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpq/ntpq-opts.h -> BitKeeper/deleted/.del-ntpq-opts.h
    
      BitKeeper/deleted/.del-ntpq-opts.texi at 1.77, 2007-05-30 17:51:50-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.6.2
    
      BitKeeper/deleted/.del-ntpq-opts.texi at 1.49.6.2, 2007-05-30 17:50:42-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpq/ntpq-opts.texi -> BitKeeper/deleted/.del-ntpq-opts.texi
    
      BitKeeper/deleted/.del-ntpq.1 at 1.76, 2007-05-30 17:51:53-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.6.2
    
      BitKeeper/deleted/.del-ntpq.1 at 1.48.6.2, 2007-05-30 17:50:44-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: ntpq/ntpq.1 -> BitKeeper/deleted/.del-ntpq.1
    
      BitKeeper/deleted/.del-packageinfo.sh~9547f70d1df81d4 at 1.79, 2007-05-30 17:51:54-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.65.12.2
    
      BitKeeper/deleted/.del-packageinfo.sh~9547f70d1df81d4 at 1.65.12.2, 2007-05-30 17:50:31-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: packageinfo.sh -> BitKeeper/deleted/.del-packageinfo.sh~9547f70d1df81d4
    
      BitKeeper/deleted/.del-sntp-opts.c at 1.77, 2007-05-30 17:51:56-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.6.2
    
      BitKeeper/deleted/.del-sntp-opts.c at 1.49.6.2, 2007-05-30 17:50:45-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: sntp/sntp-opts.c -> BitKeeper/deleted/.del-sntp-opts.c
    
      BitKeeper/deleted/.del-sntp-opts.h at 1.77, 2007-05-30 17:51:59-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.6.2
    
      BitKeeper/deleted/.del-sntp-opts.h at 1.49.6.2, 2007-05-30 17:50:47-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: sntp/sntp-opts.h -> BitKeeper/deleted/.del-sntp-opts.h
    
      BitKeeper/deleted/.del-sntp-opts.texi at 1.74, 2007-05-30 17:52:00-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.46.6.2
    
      BitKeeper/deleted/.del-sntp-opts.texi at 1.46.6.2, 2007-05-30 17:50:50-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: sntp/sntp-opts.texi -> BitKeeper/deleted/.del-sntp-opts.texi
    
      BitKeeper/deleted/.del-sntp.1 at 1.77, 2007-05-30 17:52:02-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.6.2
    
      BitKeeper/deleted/.del-sntp.1 at 1.49.6.2, 2007-05-30 17:50:51-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: sntp/sntp.1 -> BitKeeper/deleted/.del-sntp.1
    
    ChangeSet at 1.1436.1.54, 2007-05-29 07:43:58-04:00, stenn at whimsy.udel.edu +25 -0
      NTP_4_2_4P2_RC5
      TAG: NTP_4_2_4P2_RC5
    
      util/ntp-keygen-opts.c at 1.49.6.1, 2007-05-29 07:43:51-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC5
    
      util/ntp-keygen-opts.h at 1.49.6.1, 2007-05-29 07:43:52-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC5
    
      util/ntp-keygen-opts.texi at 1.47.6.1, 2007-05-29 07:43:53-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC5
    
      util/ntp-keygen.1 at 1.47.6.1, 2007-05-29 07:43:54-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC5
    
      ntpd/ntpd-opts.c at 1.50.6.1, 2007-05-29 07:43:35-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC5
    
      ntpd/ntpd-opts.h at 1.50.6.1, 2007-05-29 07:43:35-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC5
    
      ntpd/ntpd-opts.texi at 1.49.6.1, 2007-05-29 07:43:36-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC5
    
      ntpd/ntpd.1 at 1.48.6.1, 2007-05-29 07:43:37-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC5
    
      ntpdc/ntpdc-opts.c at 1.50.6.1, 2007-05-29 07:43:41-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC5
    
      ntpdc/ntpdc-opts.h at 1.50.6.1, 2007-05-29 07:43:42-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC5
    
      ntpdc/ntpdc-opts.texi at 1.48.6.1, 2007-05-29 07:43:43-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC5
    
      ntpdc/ntpdc.1 at 1.48.6.1, 2007-05-29 07:43:43-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC5
    
      ntpd/ntpdsim-opts.c at 1.50.6.1, 2007-05-29 07:43:38-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC5
    
      ntpd/ntpdsim-opts.h at 1.50.6.1, 2007-05-29 07:43:39-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC5
    
      ntpd/ntpdsim-opts.texi at 1.48.6.1, 2007-05-29 07:43:40-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC5
    
      ntpd/ntpdsim.1 at 1.48.6.1, 2007-05-29 07:43:40-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC5
    
      ntpq/ntpq-opts.c at 1.52.6.1, 2007-05-29 07:43:44-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC5
    
      ntpq/ntpq-opts.h at 1.52.6.1, 2007-05-29 07:43:45-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC5
    
      ntpq/ntpq-opts.texi at 1.49.6.1, 2007-05-29 07:43:45-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC5
    
      ntpq/ntpq.1 at 1.48.6.1, 2007-05-29 07:43:46-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC5
    
      packageinfo.sh at 1.65.12.1, 2007-05-29 07:43:47-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC5
    
      sntp/sntp-opts.c at 1.49.6.1, 2007-05-29 07:43:48-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC5
    
      sntp/sntp-opts.h at 1.49.6.1, 2007-05-29 07:43:49-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC5
    
      sntp/sntp-opts.texi at 1.46.6.1, 2007-05-29 07:43:49-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC5
    
      sntp/sntp.1 at 1.49.6.1, 2007-05-29 07:43:50-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC5
    


More information about the commitlogs mailing list