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

Harlan Stenn stenn at whimsy.udel.edu
Mon May 28 01:18:02 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.1494, 2007-05-28 04:15:17-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.51
    
      BitKeeper/deleted/.del-ntp-keygen-opts.c at 1.76, 2007-05-28 04:13:58-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.5.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.c at 1.49.5.2, 2007-05-28 04:13:37-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.76, 2007-05-28 04:14:01-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.5.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.h at 1.49.5.2, 2007-05-28 04:13:39-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.74, 2007-05-28 04:14:04-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.47.5.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.texi at 1.47.5.2, 2007-05-28 04:13:41-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.74, 2007-05-28 04:14:05-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.47.5.2
    
      BitKeeper/deleted/.del-ntp-keygen.1 at 1.47.5.2, 2007-05-28 04:13:42-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.77, 2007-05-28 04:14:07-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.5.2
    
      BitKeeper/deleted/.del-ntpd-opts.c at 1.50.5.2, 2007-05-28 04:13:32-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.77, 2007-05-28 04:14:10-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.5.2
    
      BitKeeper/deleted/.del-ntpd-opts.h at 1.50.5.2, 2007-05-28 04:13:44-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.76, 2007-05-28 04:14:12-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.5.2
    
      BitKeeper/deleted/.del-ntpd-opts.texi at 1.49.5.2, 2007-05-28 04:13:46-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.75, 2007-05-28 04:14:15-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.5.2
    
      BitKeeper/deleted/.del-ntpd.1 at 1.48.5.2, 2007-05-28 04:13:48-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.77, 2007-05-28 04:14:18-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.5.2
    
      BitKeeper/deleted/.del-ntpdc-opts.c at 1.50.5.2, 2007-05-28 04:13:18-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.77, 2007-05-28 04:14:20-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.5.2
    
      BitKeeper/deleted/.del-ntpdc-opts.h at 1.50.5.2, 2007-05-28 04:13:19-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.75, 2007-05-28 04:14:22-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.5.2
    
      BitKeeper/deleted/.del-ntpdc-opts.texi at 1.48.5.2, 2007-05-28 04:13:21-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.75, 2007-05-28 04:14:23-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.5.2
    
      BitKeeper/deleted/.del-ntpdc.1 at 1.48.5.2, 2007-05-28 04:13:22-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.77, 2007-05-28 04:14:26-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.5.2
    
      BitKeeper/deleted/.del-ntpdsim-opts.c at 1.50.5.2, 2007-05-28 04:13:49-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.77, 2007-05-28 04:14:28-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.50.5.2
    
      BitKeeper/deleted/.del-ntpdsim-opts.h at 1.50.5.2, 2007-05-28 04:13:51-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.75, 2007-05-28 04:14:30-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.5.2
    
      BitKeeper/deleted/.del-ntpdsim-opts.texi at 1.48.5.2, 2007-05-28 04:13:53-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.75, 2007-05-28 04:14:33-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.5.2
    
      BitKeeper/deleted/.del-ntpdsim.1 at 1.48.5.2, 2007-05-28 04:13:55-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.79, 2007-05-28 04:14:35-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.52.5.2
    
      BitKeeper/deleted/.del-ntpq-opts.c at 1.52.5.2, 2007-05-28 04:13:23-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.79, 2007-05-28 04:14:36-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.52.5.2
    
      BitKeeper/deleted/.del-ntpq-opts.h at 1.52.5.2, 2007-05-28 04:13:24-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.76, 2007-05-28 04:14:37-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.5.2
    
      BitKeeper/deleted/.del-ntpq-opts.texi at 1.49.5.2, 2007-05-28 04:13:26-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.75, 2007-05-28 04:14:40-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.48.5.2
    
      BitKeeper/deleted/.del-ntpq.1 at 1.48.5.2, 2007-05-28 04:13:28-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.78, 2007-05-28 04:14:41-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.65.11.2
    
      BitKeeper/deleted/.del-packageinfo.sh~9547f70d1df81d4 at 1.65.11.2, 2007-05-28 04:13:17-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.76, 2007-05-28 04:14:43-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.5.2
    
      BitKeeper/deleted/.del-sntp-opts.c at 1.49.5.2, 2007-05-28 04:13:29-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.76, 2007-05-28 04:14:46-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.5.2
    
      BitKeeper/deleted/.del-sntp-opts.h at 1.49.5.2, 2007-05-28 04:13:31-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.73, 2007-05-28 04:14:47-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.46.5.2
    
      BitKeeper/deleted/.del-sntp-opts.texi at 1.46.5.2, 2007-05-28 04:13:34-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.76, 2007-05-28 04:14:49-04:00, stenn at whimsy.udel.edu +0 -0
        Auto merged
        MERGE: 1.49.5.2
    
      BitKeeper/deleted/.del-sntp.1 at 1.49.5.2, 2007-05-28 04:13:35-04:00, stenn at whimsy.udel.edu +0 -0
        Merge rename: sntp/sntp.1 -> BitKeeper/deleted/.del-sntp.1
    
    ChangeSet at 1.1436.1.51, 2007-05-27 07:45:05-04:00, stenn at whimsy.udel.edu +25 -0
      NTP_4_2_4P2_RC4
      TAG: NTP_4_2_4P2_RC4
    
      util/ntp-keygen-opts.c at 1.49.5.1, 2007-05-27 07:44:56-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC4
    
      util/ntp-keygen-opts.h at 1.49.5.1, 2007-05-27 07:44:57-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC4
    
      util/ntp-keygen-opts.texi at 1.47.5.1, 2007-05-27 07:44:58-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC4
    
      util/ntp-keygen.1 at 1.47.5.1, 2007-05-27 07:44:59-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC4
    
      ntpd/ntpd-opts.c at 1.50.5.1, 2007-05-27 07:44:40-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC4
    
      ntpd/ntpd-opts.h at 1.50.5.1, 2007-05-27 07:44:40-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC4
    
      ntpd/ntpd-opts.texi at 1.49.5.1, 2007-05-27 07:44:41-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC4
    
      ntpd/ntpd.1 at 1.48.5.1, 2007-05-27 07:44:42-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC4
    
      ntpdc/ntpdc-opts.c at 1.50.5.1, 2007-05-27 07:44:46-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC4
    
      ntpdc/ntpdc-opts.h at 1.50.5.1, 2007-05-27 07:44:47-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC4
    
      ntpdc/ntpdc-opts.texi at 1.48.5.1, 2007-05-27 07:44:48-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC4
    
      ntpdc/ntpdc.1 at 1.48.5.1, 2007-05-27 07:44:49-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC4
    
      ntpd/ntpdsim-opts.c at 1.50.5.1, 2007-05-27 07:44:43-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC4
    
      ntpd/ntpdsim-opts.h at 1.50.5.1, 2007-05-27 07:44:44-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC4
    
      ntpd/ntpdsim-opts.texi at 1.48.5.1, 2007-05-27 07:44:45-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC4
    
      ntpd/ntpdsim.1 at 1.48.5.1, 2007-05-27 07:44:46-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC4
    
      ntpq/ntpq-opts.c at 1.52.5.1, 2007-05-27 07:44:50-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC4
    
      ntpq/ntpq-opts.h at 1.52.5.1, 2007-05-27 07:44:50-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC4
    
      ntpq/ntpq-opts.texi at 1.49.5.1, 2007-05-27 07:44:51-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC4
    
      ntpq/ntpq.1 at 1.48.5.1, 2007-05-27 07:44:52-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC4
    
      packageinfo.sh at 1.65.11.1, 2007-05-27 07:44:52-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC4
    
      sntp/sntp-opts.c at 1.49.5.1, 2007-05-27 07:44:53-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC4
    
      sntp/sntp-opts.h at 1.49.5.1, 2007-05-27 07:44:54-04:00, stenn at whimsy.udel.edu +3 -3
        NTP_4_2_4P2_RC4
    
      sntp/sntp-opts.texi at 1.46.5.1, 2007-05-27 07:44:55-04:00, stenn at whimsy.udel.edu +1 -1
        NTP_4_2_4P2_RC4
    
      sntp/sntp.1 at 1.49.5.1, 2007-05-27 07:44:55-04:00, stenn at whimsy.udel.edu +2 -2
        NTP_4_2_4P2_RC4
    


More information about the commitlogs mailing list