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

Harlan Stenn stenn at whimsy.udel.edu
Tue Sep 11 02:38:10 UTC 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.1590, 2007-09-10 22:35:07-04:00, stenn at whimsy.udel.edu +27 -0
      Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
      into  whimsy.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.1436.1.84
    
      BitKeeper/deleted/.del-ntp-keygen-opts.c at 1.84, 2007-09-10 22:05:23-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.13.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.c at 1.49.13.2, 2007-09-10 22:04:59-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.84, 2007-09-10 22:05:25-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.13.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.h at 1.49.13.2, 2007-09-10 22:05:00-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.82, 2007-09-10 22:05:28-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.47.13.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.texi at 1.47.13.2, 2007-09-10 22:05:02-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.82, 2007-09-10 22:05:29-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.47.13.2
    
      BitKeeper/deleted/.del-ntp-keygen.1 at 1.47.13.2, 2007-09-10 22:05:03-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.85, 2007-09-10 22:05:31-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.13.2
    
      BitKeeper/deleted/.del-ntpd-opts.c at 1.50.13.2, 2007-09-10 22:04:54-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.85, 2007-09-10 22:05:34-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.13.2
    
      BitKeeper/deleted/.del-ntpd-opts.h at 1.50.13.2, 2007-09-10 22:05:06-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.84, 2007-09-10 22:05:37-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.13.2
    
      BitKeeper/deleted/.del-ntpd-opts.texi at 1.49.13.2, 2007-09-10 22:05:08-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.83, 2007-09-10 22:05:39-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.13.2
    
      BitKeeper/deleted/.del-ntpd.1 at 1.48.13.2, 2007-09-10 22:05:10-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.85, 2007-09-10 22:05:42-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.13.2
    
      BitKeeper/deleted/.del-ntpdc-opts.c at 1.50.13.2, 2007-09-10 22:04:40-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.85, 2007-09-10 22:05:43-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.13.2
    
      BitKeeper/deleted/.del-ntpdc-opts.h at 1.50.13.2, 2007-09-10 22:04:41-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.83, 2007-09-10 22:05:46-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.13.2
    
      BitKeeper/deleted/.del-ntpdc-opts.texi at 1.48.13.2, 2007-09-10 22:04:43-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.83, 2007-09-10 22:05:47-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.13.2
    
      BitKeeper/deleted/.del-ntpdc.1 at 1.48.13.2, 2007-09-10 22:04:44-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.85, 2007-09-10 22:05:50-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.13.2
    
      BitKeeper/deleted/.del-ntpdsim-opts.c at 1.50.13.2, 2007-09-10 22:05:12-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.85, 2007-09-10 22:05:52-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.13.2
    
      BitKeeper/deleted/.del-ntpdsim-opts.h at 1.50.13.2, 2007-09-10 22:05:14-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.83, 2007-09-10 22:05:54-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.13.2
    
      BitKeeper/deleted/.del-ntpdsim-opts.texi at 1.48.13.2, 2007-09-10 22:05:16-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.83, 2007-09-10 22:05:56-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.13.2
    
      BitKeeper/deleted/.del-ntpdsim.1 at 1.48.13.2, 2007-09-10 22:05:18-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.87, 2007-09-10 22:05:59-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.52.13.2
    
      BitKeeper/deleted/.del-ntpq-opts.c at 1.52.13.2, 2007-09-10 22:04:46-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.87, 2007-09-10 22:06:00-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.52.13.2
    
      BitKeeper/deleted/.del-ntpq-opts.h at 1.52.13.2, 2007-09-10 22:04:47-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.84, 2007-09-10 22:06:02-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.13.2
    
      BitKeeper/deleted/.del-ntpq-opts.texi at 1.49.13.2, 2007-09-10 22:04:48-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.83, 2007-09-10 22:06:05-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.13.2
    
      BitKeeper/deleted/.del-ntpq.1 at 1.48.13.2, 2007-09-10 22:04:49-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.86, 2007-09-10 22:06:05-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.65.19.3
    
      BitKeeper/deleted/.del-packageinfo.sh~9547f70d1df81d4 at 1.65.19.3, 2007-09-10 22:04:38-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.84, 2007-09-10 22:06:07-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.13.2
    
      BitKeeper/deleted/.del-sntp-opts.c at 1.49.13.2, 2007-09-10 22:04:51-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.84, 2007-09-10 22:06:10-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.13.2
    
      BitKeeper/deleted/.del-sntp-opts.h at 1.49.13.2, 2007-09-10 22:04:52-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.81, 2007-09-10 22:06:11-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.46.13.2
    
      BitKeeper/deleted/.del-sntp-opts.texi at 1.46.13.2, 2007-09-10 22:04:55-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.84, 2007-09-10 22:06:13-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.13.2
    
      BitKeeper/deleted/.del-sntp.1 at 1.49.13.2, 2007-09-10 22:04:57-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: sntp/sntp.1 -> BitKeeper/deleted/.del-sntp.1
    
      ChangeLog at 1.108, 2007-09-10 22:34:58-04:00, stenn at whimsy.udel.edu +2 -3
        Merge cleanup
        MERGE: 1.1.1.34
    
      NEWS at 1.101, 2007-09-10 22:35:00-04:00, stenn at whimsy.udel.edu +8 -7
        Merge cleanup
        MERGE: 1.86.1.12
    
    ChangeSet at 1.1436.1.84, 2007-09-10 20:40:19-04:00, stenn at whimsy.udel.edu +25 -0
      NTP_4_2_4P4
      TAG: NTP_4_2_4P4
    
      util/ntp-keygen-opts.c at 1.49.13.1, 2007-09-10 20:40:11-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P4
    
      util/ntp-keygen-opts.h at 1.49.13.1, 2007-09-10 20:40:12-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P4
    
      util/ntp-keygen-opts.texi at 1.47.13.1, 2007-09-10 20:40:13-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P4
    
      util/ntp-keygen.1 at 1.47.13.1, 2007-09-10 20:40:14-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P4
    
      ntpd/ntpd-opts.c at 1.50.13.1, 2007-09-10 20:39:55-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P4
    
      ntpd/ntpd-opts.h at 1.50.13.1, 2007-09-10 20:39:56-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P4
    
      ntpd/ntpd-opts.texi at 1.49.13.1, 2007-09-10 20:39:57-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P4
    
      ntpd/ntpd.1 at 1.48.13.1, 2007-09-10 20:39:57-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P4
    
      ntpdc/ntpdc-opts.c at 1.50.13.1, 2007-09-10 20:40:01-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P4
    
      ntpdc/ntpdc-opts.h at 1.50.13.1, 2007-09-10 20:40:02-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P4
    
      ntpdc/ntpdc-opts.texi at 1.48.13.1, 2007-09-10 20:40:03-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P4
    
      ntpdc/ntpdc.1 at 1.48.13.1, 2007-09-10 20:40:03-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P4
    
      ntpd/ntpdsim-opts.c at 1.50.13.1, 2007-09-10 20:39:58-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P4
    
      ntpd/ntpdsim-opts.h at 1.50.13.1, 2007-09-10 20:39:58-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P4
    
      ntpd/ntpdsim-opts.texi at 1.48.13.1, 2007-09-10 20:40:00-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P4
    
      ntpd/ntpdsim.1 at 1.48.13.1, 2007-09-10 20:40:00-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P4
    
      ntpq/ntpq-opts.c at 1.52.13.1, 2007-09-10 20:40:04-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P4
    
      ntpq/ntpq-opts.h at 1.52.13.1, 2007-09-10 20:40:05-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P4
    
      ntpq/ntpq-opts.texi at 1.49.13.1, 2007-09-10 20:40:06-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P4
    
      ntpq/ntpq.1 at 1.48.13.1, 2007-09-10 20:40:06-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P4
    
      packageinfo.sh at 1.65.19.2, 2007-09-10 20:40:07-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P4
    
      sntp/sntp-opts.c at 1.49.13.1, 2007-09-10 20:40:08-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P4
    
      sntp/sntp-opts.h at 1.49.13.1, 2007-09-10 20:40:08-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P4
    
      sntp/sntp-opts.texi at 1.46.13.1, 2007-09-10 20:40:09-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P4
    
      sntp/sntp.1 at 1.49.13.1, 2007-09-10 20:40:10-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P4
    
    ChangeSet at 1.1436.1.83, 2007-09-10 16:56:09-04:00, stenn at whimsy.udel.edu +3 -0
      Release 4.2.4p4
    
      packageinfo.sh at 1.65.19.1, 2007-09-10 16:55:58-04:00, stenn at whimsy.udel.edu +1 -1
        Release 4.2.4p4
    
      ChangeLog at 1.1.1.34, 2007-09-10 16:55:51-04:00, stenn at whimsy.udel.edu +3 -0
        Release 4.2.4p4
    
      NEWS at 1.86.1.12, 2007-09-10 16:55:54-04:00, stenn at whimsy.udel.edu +11 -0
        Release 4.2.4p4
    


More information about the commitlogs mailing list