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

Harlan Stenn stenn at whimsy.udel.edu
Sat May 26 00:22:05 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.1489, 2007-05-26 03:19:36-04:00, stenn at whimsy.udel.edu +29 -0
      Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
      into  whimsy.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.1436.1.53
    
      BitKeeper/deleted/.del-ntp-keygen-opts.c at 1.75, 2007-05-26 03:09:46-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.4.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.c at 1.49.4.2, 2007-05-26 03:09:23-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.75, 2007-05-26 03:09:49-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.4.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.h at 1.49.4.2, 2007-05-26 03:09:24-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.73, 2007-05-26 03:09:52-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.47.4.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.texi at 1.47.4.2, 2007-05-26 03:09:26-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.73, 2007-05-26 03:09:53-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.47.4.2
    
      BitKeeper/deleted/.del-ntp-keygen.1 at 1.47.4.2, 2007-05-26 03:09:27-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.76, 2007-05-26 03:09:55-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.4.2
    
      BitKeeper/deleted/.del-ntpd-opts.c at 1.50.4.2, 2007-05-26 03:09:19-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.76, 2007-05-26 03:09:58-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.4.2
    
      BitKeeper/deleted/.del-ntpd-opts.h at 1.50.4.2, 2007-05-26 03:09:29-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.75, 2007-05-26 03:10:00-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.4.2
    
      BitKeeper/deleted/.del-ntpd-opts.texi at 1.49.4.2, 2007-05-26 03:09:30-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.74, 2007-05-26 03:10:03-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.4.2
    
      BitKeeper/deleted/.del-ntpd.1 at 1.48.4.2, 2007-05-26 03:09:32-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.76, 2007-05-26 03:10:05-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.4.2
    
      BitKeeper/deleted/.del-ntpdc-opts.c at 1.50.4.2, 2007-05-26 03:09:03-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.76, 2007-05-26 03:10:08-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.4.2
    
      BitKeeper/deleted/.del-ntpdc-opts.h at 1.50.4.2, 2007-05-26 03:09:05-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.74, 2007-05-26 03:10:10-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.4.2
    
      BitKeeper/deleted/.del-ntpdc-opts.texi at 1.48.4.2, 2007-05-26 03:09:07-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.74, 2007-05-26 03:10:11-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.4.2
    
      BitKeeper/deleted/.del-ntpdc.1 at 1.48.4.2, 2007-05-26 03:09:08-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.76, 2007-05-26 03:10:14-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.4.2
    
      BitKeeper/deleted/.del-ntpdsim-opts.c at 1.50.4.2, 2007-05-26 03:09:34-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.76, 2007-05-26 03:10:17-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.4.2
    
      BitKeeper/deleted/.del-ntpdsim-opts.h at 1.50.4.2, 2007-05-26 03:09:36-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.74, 2007-05-26 03:10:20-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.4.2
    
      BitKeeper/deleted/.del-ntpdsim-opts.texi at 1.48.4.2, 2007-05-26 03:09:38-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.74, 2007-05-26 03:10:23-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.4.2
    
      BitKeeper/deleted/.del-ntpdsim.1 at 1.48.4.2, 2007-05-26 03:09:40-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.78, 2007-05-26 03:10:25-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.52.4.2
    
      BitKeeper/deleted/.del-ntpq-opts.c at 1.52.4.2, 2007-05-26 03:09:09-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.78, 2007-05-26 03:10:25-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.52.4.2
    
      BitKeeper/deleted/.del-ntpq-opts.h at 1.52.4.2, 2007-05-26 03:09:10-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.75, 2007-05-26 03:10:27-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.4.2
    
      BitKeeper/deleted/.del-ntpq-opts.texi at 1.49.4.2, 2007-05-26 03:09:11-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.74, 2007-05-26 03:10:29-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.4.2
    
      BitKeeper/deleted/.del-ntpq.1 at 1.48.4.2, 2007-05-26 03:09:13-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.77, 2007-05-26 03:10:30-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.65.10.2
    
      BitKeeper/deleted/.del-packageinfo.sh~9547f70d1df81d4 at 1.65.10.2, 2007-05-26 03:09:02-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.75, 2007-05-26 03:10:32-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.4.2
    
      BitKeeper/deleted/.del-sntp-opts.c at 1.49.4.2, 2007-05-26 03:09:15-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.75, 2007-05-26 03:10:35-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.4.2
    
      BitKeeper/deleted/.del-sntp-opts.h at 1.49.4.2, 2007-05-26 03:09:17-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.72, 2007-05-26 03:10:36-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.46.4.2
    
      BitKeeper/deleted/.del-sntp-opts.texi at 1.46.4.2, 2007-05-26 03:09:20-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.75, 2007-05-26 03:10:38-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.4.2
    
      BitKeeper/deleted/.del-sntp.1 at 1.49.4.2, 2007-05-26 03:09:21-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: sntp/sntp.1 -> BitKeeper/deleted/.del-sntp.1
    
      ChangeLog at 1.50, 2007-05-26 03:19:27-04:00, stenn at whimsy.udel.edu +2 -0
        Merge cleanup.
        MERGE: 1.1.1.14
    
      NEWS at 1.93, 2007-05-26 03:09:43-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.86.1.4
    
      include/recvbuff.h at 1.13, 2007-05-26 03:10:39-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.11.1.1
    
      ports/winnt/ntpd/ntp_iocompletionport.c at 1.24, 2007-05-26 03:19:28-04:00, stenn at whimsy.udel.edu +15 -0
        I hope this is OK... merge cleanup.
        MERGE: 1.21.1.1
    
    ChangeSet at 1.1436.1.53, 2007-05-25 07:44:43-04:00, stenn at whimsy.udel.edu +25 -0
      NTP_4_2_4P2_RC3
      TAG: NTP_4_2_4P2_RC3
    
      util/ntp-keygen-opts.c at 1.49.4.1, 2007-05-25 07:44:37-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC3
    
      util/ntp-keygen-opts.h at 1.49.4.1, 2007-05-25 07:44:38-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC3
    
      util/ntp-keygen-opts.texi at 1.47.4.1, 2007-05-25 07:44:38-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC3
    
      util/ntp-keygen.1 at 1.47.4.1, 2007-05-25 07:44:39-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC3
    
      ntpd/ntpd-opts.c at 1.50.4.1, 2007-05-25 07:44:20-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC3
    
      ntpd/ntpd-opts.h at 1.50.4.1, 2007-05-25 07:44:21-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC3
    
      ntpd/ntpd-opts.texi at 1.49.4.1, 2007-05-25 07:44:22-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC3
    
      ntpd/ntpd.1 at 1.48.4.1, 2007-05-25 07:44:23-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC3
    
      ntpdc/ntpdc-opts.c at 1.50.4.1, 2007-05-25 07:44:26-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC3
    
      ntpdc/ntpdc-opts.h at 1.50.4.1, 2007-05-25 07:44:27-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC3
    
      ntpdc/ntpdc-opts.texi at 1.48.4.1, 2007-05-25 07:44:28-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC3
    
      ntpdc/ntpdc.1 at 1.48.4.1, 2007-05-25 07:44:28-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC3
    
      ntpd/ntpdsim-opts.c at 1.50.4.1, 2007-05-25 07:44:23-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC3
    
      ntpd/ntpdsim-opts.h at 1.50.4.1, 2007-05-25 07:44:24-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC3
    
      ntpd/ntpdsim-opts.texi at 1.48.4.1, 2007-05-25 07:44:25-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC3
    
      ntpd/ntpdsim.1 at 1.48.4.1, 2007-05-25 07:44:25-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC3
    
      ntpq/ntpq-opts.c at 1.52.4.1, 2007-05-25 07:44:29-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC3
    
      ntpq/ntpq-opts.h at 1.52.4.1, 2007-05-25 07:44:30-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC3
    
      ntpq/ntpq-opts.texi at 1.49.4.1, 2007-05-25 07:44:31-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC3
    
      ntpq/ntpq.1 at 1.48.4.1, 2007-05-25 07:44:32-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC3
    
      packageinfo.sh at 1.65.10.1, 2007-05-25 07:44:33-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC3
    
      sntp/sntp-opts.c at 1.49.4.1, 2007-05-25 07:44:33-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC3
    
      sntp/sntp-opts.h at 1.49.4.1, 2007-05-25 07:44:35-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC3
    
      sntp/sntp-opts.texi at 1.46.4.1, 2007-05-25 07:44:35-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC3
    
      sntp/sntp.1 at 1.49.4.1, 2007-05-25 07:44:36-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC3
    
    ChangeSet at 1.1436.1.52, 2007-05-25 02:18:59-04:00, stenn at whimsy.udel.edu +1 -0
      cleanup
    
      NEWS at 1.86.1.4, 2007-05-25 02:18:48-04:00, stenn at whimsy.udel.edu +1 -0
        cleanup
    
    ChangeSet at 1.1436.1.51, 2007-05-25 02:13:56-04:00, stenn at whimsy.udel.edu +1 -0
      Merge pogo:/usa/mayer/ntp-stable
      into  whimsy.udel.edu:/deacon/backroom/ntp-stable
      MERGE: 1.1436.3.1
    
      ChangeLog at 1.1.1.14, 2007-05-25 02:13:53-04:00, stenn at whimsy.udel.edu +1 -1
        Clean up a merge conflict.
        MERGE: 1.1.2.1
    
    ChangeSet at 1.1436.3.1, 2007-05-25 02:06:52-04:00, stenn at whimsy.udel.edu +2 -0
      Upgraded autogen and libopts
    
      ChangeLog at 1.1.2.1, 2007-05-25 02:06:37-04:00, stenn at whimsy.udel.edu +1 -0
        Upgraded autogen and libopts
    
      NEWS at 1.86.1.3, 2007-05-25 02:06:38-04:00, stenn at whimsy.udel.edu +1 -0
        Upgraded autogen and libopts
    
    ChangeSet at 1.1436.1.50, 2007-05-25 01:07:59-04:00, stenn at pogo.udel.edu +1 -0
      cleanup ChangeLog
    
      ChangeLog at 1.1.1.13, 2007-05-25 01:07:52-04:00, stenn at pogo.udel.edu +1 -1
        cleanup ChangeLog
    
    ChangeSet at 1.1436.1.49, 2007-05-24 08:10:30-04:00, mayer at pogo.udel.edu +1 -0
      Bug #527 Don't write from source address length to wrong location
    
      ChangeLog at 1.1.1.12, 2007-05-24 08:10:20-04:00, mayer at pogo.udel.edu +1 -0
        Bug #527 Don't write from source address length to wrong location
    
    ChangeSet at 1.1436.1.48, 2007-05-24 08:08:34-04:00, mayer at pogo.udel.edu +4 -0
      Bug #527 Don't write from source address length to wrong location
    
      include/recvbuff.h at 1.11.1.1, 2007-05-24 08:08:03-04:00, mayer at pogo.udel.edu +2 -0
        Bug #527 Don't write from source address length to wrong location
    
      libntp/recvbuff.c at 1.25, 2007-05-24 08:08:03-04:00, mayer at pogo.udel.edu +27 -13
        Bug #527 Don't write from source address length to wrong location
    
      ports/winnt/libntp/transmitbuff.c at 1.7, 2007-05-24 08:08:03-04:00, mayer at pogo.udel.edu +10 -10
        Bug #527 Don't write from source address length to wrong location
    
      ports/winnt/ntpd/ntp_iocompletionport.c at 1.21.1.1, 2007-05-24 08:08:03-04:00, mayer at pogo.udel.edu +76 -62
        Bug #527 Don't write from source address length to wrong location
    


More information about the commitlogs mailing list