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

Harlan Stenn stenn at deacon.udel.edu
Sat Sep 11 21:34:32 UTC 2010


VAR       CLIENT              SERVER              
===       ======              ======              
USER      stenn               stenn               
HOST      deacon.udel.edu     deacon.udel.edu     
ROOT      /deacon/backroom/ntp-dev/deacon/backroom/ntp-stable
LEVEL     1                   1                   
TIME_T    1272912116          1272912116          
UTC       20100503184156      20100503184156      
VERSION   bk-4.6b             bk-4.6b             

stenn at deacon.udel.edu fired the post-incoming--012commitlogs trigger in /deacon/backroom/ntp-dev
    Received the following changesets
    
    ChangeSet at 1.2180, 2010-09-11 17:34:06-04:00, stenn at deacon.udel.edu +27 -0
      Merge deacon.udel.edu:/deacon/backroom/ntp-stable
      into  deacon.udel.edu:/deacon/backroom/ntp-dev
      MERGE: 1.2082.4.113
    
      BitKeeper/deleted/.del-ntp-keygen-opts.c~d0a1ce0533b25b2 at 1.266, 2010-09-11 17:24:36-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.247.16.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.c~d0a1ce0533b25b2 at 1.247.16.2, 2010-09-11 17:24:34-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: util/ntp-keygen-opts.c -> BitKeeper/deleted/.del-ntp-keygen-opts.c~d0a1ce0533b25b2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.h~f0717b94e4446b26 at 1.266, 2010-09-11 17:24:36-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.247.16.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.h~f0717b94e4446b26 at 1.247.16.2, 2010-09-11 17:24:35-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: util/ntp-keygen-opts.h -> BitKeeper/deleted/.del-ntp-keygen-opts.h~f0717b94e4446b26
    
      BitKeeper/deleted/.del-ntp-keygen-opts.texi~8c66011d5d8b8946 at 1.265, 2010-09-11 17:24:36-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.246.16.2
    
      BitKeeper/deleted/.del-ntp-keygen-opts.texi~8c66011d5d8b8946 at 1.246.16.2, 2010-09-11 17:24:35-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: util/ntp-keygen-opts.texi -> BitKeeper/deleted/.del-ntp-keygen-opts.texi~8c66011d5d8b8946
    
      BitKeeper/deleted/.del-ntp-keygen.1~5f9bc1fd9c40085a at 1.265, 2010-09-11 17:24:36-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.246.16.2
    
      BitKeeper/deleted/.del-ntp-keygen.1~5f9bc1fd9c40085a at 1.246.16.2, 2010-09-11 17:24:35-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: util/ntp-keygen.1 -> BitKeeper/deleted/.del-ntp-keygen.1~5f9bc1fd9c40085a
    
      BitKeeper/deleted/.del-ntpd-opts.c~144b52caa1ef699c at 1.268, 2010-09-11 17:24:36-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.248.16.2
    
      BitKeeper/deleted/.del-ntpd-opts.c~144b52caa1ef699c at 1.248.16.2, 2010-09-11 17:24:34-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpd/ntpd-opts.c -> BitKeeper/deleted/.del-ntpd-opts.c~144b52caa1ef699c
    
      BitKeeper/deleted/.del-ntpd-opts.h~2b00d71c3cee10a7 at 1.268, 2010-09-11 17:24:36-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.248.16.2
    
      BitKeeper/deleted/.del-ntpd-opts.h~2b00d71c3cee10a7 at 1.248.16.2, 2010-09-11 17:24:35-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpd/ntpd-opts.h -> BitKeeper/deleted/.del-ntpd-opts.h~2b00d71c3cee10a7
    
      BitKeeper/deleted/.del-ntpd-opts.texi~9cb5bac4bf6450c1 at 1.266, 2010-09-11 17:24:36-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.246.16.2
    
      BitKeeper/deleted/.del-ntpd-opts.texi~9cb5bac4bf6450c1 at 1.246.16.2, 2010-09-11 17:24:35-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpd/ntpd-opts.texi -> BitKeeper/deleted/.del-ntpd-opts.texi~9cb5bac4bf6450c1
    
      BitKeeper/deleted/.del-ntpd.1~28d9b05264c45059 at 1.266, 2010-09-11 17:24:36-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.246.16.2
    
      BitKeeper/deleted/.del-ntpd.1~28d9b05264c45059 at 1.246.16.2, 2010-09-11 17:24:35-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpd/ntpd.1 -> BitKeeper/deleted/.del-ntpd.1~28d9b05264c45059
    
      BitKeeper/deleted/.del-ntpdc-opts.c~58e4a492bd134fb8 at 1.263, 2010-09-11 17:24:36-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.244.16.2
    
      BitKeeper/deleted/.del-ntpdc-opts.c~58e4a492bd134fb8 at 1.244.16.2, 2010-09-11 17:24:35-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpdc/ntpdc-opts.c -> BitKeeper/deleted/.del-ntpdc-opts.c~58e4a492bd134fb8
    
      BitKeeper/deleted/.del-ntpdc-opts.h~b31c10ed4f5c2052 at 1.263, 2010-09-11 17:24:36-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.244.16.2
    
      BitKeeper/deleted/.del-ntpdc-opts.h~b31c10ed4f5c2052 at 1.244.16.2, 2010-09-11 17:24:35-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpdc/ntpdc-opts.h -> BitKeeper/deleted/.del-ntpdc-opts.h~b31c10ed4f5c2052
    
      BitKeeper/deleted/.del-ntpdc-opts.texi~5fe1056039fe6e4f at 1.262, 2010-09-11 17:24:36-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.243.16.2
    
      BitKeeper/deleted/.del-ntpdc-opts.texi~5fe1056039fe6e4f at 1.243.16.2, 2010-09-11 17:24:35-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpdc/ntpdc-opts.texi -> BitKeeper/deleted/.del-ntpdc-opts.texi~5fe1056039fe6e4f
    
      BitKeeper/deleted/.del-ntpdc.1~574c84f3f3e91d36 at 1.262, 2010-09-11 17:24:36-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.243.16.2
    
      BitKeeper/deleted/.del-ntpdc.1~574c84f3f3e91d36 at 1.243.16.2, 2010-09-11 17:24:35-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpdc/ntpdc.1 -> BitKeeper/deleted/.del-ntpdc.1~574c84f3f3e91d36
    
      BitKeeper/deleted/.del-ntpq-opts.c~e22ebc44f822119e at 1.264, 2010-09-11 17:24:36-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.245.16.2
    
      BitKeeper/deleted/.del-ntpq-opts.c~e22ebc44f822119e at 1.245.16.2, 2010-09-11 17:24:33-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpq/ntpq-opts.c -> BitKeeper/deleted/.del-ntpq-opts.c~e22ebc44f822119e
    
      BitKeeper/deleted/.del-ntpq-opts.h~bebfd8975972779e at 1.264, 2010-09-11 17:24:37-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.245.16.2
    
      BitKeeper/deleted/.del-ntpq-opts.h~bebfd8975972779e at 1.245.16.2, 2010-09-11 17:24:33-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpq/ntpq-opts.h -> BitKeeper/deleted/.del-ntpq-opts.h~bebfd8975972779e
    
      BitKeeper/deleted/.del-ntpq-opts.texi~fd912c16181424e at 1.263, 2010-09-11 17:24:37-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.244.16.2
    
      BitKeeper/deleted/.del-ntpq-opts.texi~fd912c16181424e at 1.244.16.2, 2010-09-11 17:24:33-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpq/ntpq-opts.texi -> BitKeeper/deleted/.del-ntpq-opts.texi~fd912c16181424e
    
      BitKeeper/deleted/.del-ntpq.1~abfc5609a4b9cf4d at 1.263, 2010-09-11 17:24:37-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.244.16.2
    
      BitKeeper/deleted/.del-ntpq.1~abfc5609a4b9cf4d at 1.244.16.2, 2010-09-11 17:24:34-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpq/ntpq.1 -> BitKeeper/deleted/.del-ntpq.1~abfc5609a4b9cf4d
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.c~8c4453f3336dd4b7 at 1.143, 2010-09-11 17:24:37-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.123.17.2
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.c~8c4453f3336dd4b7 at 1.123.17.2, 2010-09-11 17:24:34-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.c -> BitKeeper/deleted/.del-ntpsnmpd-opts.c~8c4453f3336dd4b7
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.h~59291b93d938a895 at 1.143, 2010-09-11 17:24:37-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.123.17.2
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.h~59291b93d938a895 at 1.123.17.2, 2010-09-11 17:24:34-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.h -> BitKeeper/deleted/.del-ntpsnmpd-opts.h~59291b93d938a895
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.texi~4cc265b9fc7e692d at 1.143, 2010-09-11 17:24:37-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.123.17.2
    
      BitKeeper/deleted/.del-ntpsnmpd-opts.texi~4cc265b9fc7e692d at 1.123.17.2, 2010-09-11 17:24:34-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd-opts.texi -> BitKeeper/deleted/.del-ntpsnmpd-opts.texi~4cc265b9fc7e692d
    
      BitKeeper/deleted/.del-ntpsnmpd.1~489dddca797b117c at 1.142, 2010-09-11 17:24:37-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.122.17.2
    
      BitKeeper/deleted/.del-ntpsnmpd.1~489dddca797b117c at 1.122.17.2, 2010-09-11 17:24:34-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: ntpsnmpd/ntpsnmpd.1 -> BitKeeper/deleted/.del-ntpsnmpd.1~489dddca797b117c
    
      BitKeeper/deleted/.del-packageinfo.sh~ff4c82dd98fc4a4 at 1.278, 2010-09-11 17:24:37-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.255.18.2
    
      BitKeeper/deleted/.del-packageinfo.sh~ff4c82dd98fc4a4 at 1.255.18.2, 2010-09-11 17:24:33-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: packageinfo.sh -> BitKeeper/deleted/.del-packageinfo.sh~ff4c82dd98fc4a4
    
      BitKeeper/deleted/.del-sntp-opts.c~134d906c1bc0bd88 at 1.136, 2010-09-11 17:24:37-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.117.16.2
    
      BitKeeper/deleted/.del-sntp-opts.c~134d906c1bc0bd88 at 1.117.16.2, 2010-09-11 17:24:34-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: sntp/sntp-opts.c -> BitKeeper/deleted/.del-sntp-opts.c~134d906c1bc0bd88
    
      BitKeeper/deleted/.del-sntp-opts.h~5df6f04e80275ab3 at 1.136, 2010-09-11 17:24:37-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.117.16.2
    
      BitKeeper/deleted/.del-sntp-opts.h~5df6f04e80275ab3 at 1.117.16.2, 2010-09-11 17:24:34-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: sntp/sntp-opts.h -> BitKeeper/deleted/.del-sntp-opts.h~5df6f04e80275ab3
    
      BitKeeper/deleted/.del-sntp-opts.texi~313e154133ec6f3c at 1.136, 2010-09-11 17:24:37-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.117.16.2
    
      BitKeeper/deleted/.del-sntp-opts.texi~313e154133ec6f3c at 1.117.16.2, 2010-09-11 17:24:34-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: sntp/sntp-opts.texi -> BitKeeper/deleted/.del-sntp-opts.texi~313e154133ec6f3c
    
      BitKeeper/deleted/.del-sntp.1~4b2813589f2f7814 at 1.136, 2010-09-11 17:24:37-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.117.16.2
    
      BitKeeper/deleted/.del-sntp.1~4b2813589f2f7814 at 1.117.16.2, 2010-09-11 17:24:34-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: sntp/sntp.1 -> BitKeeper/deleted/.del-sntp.1~4b2813589f2f7814
    
      BitKeeper/deleted/.del-sntp.html~ca24a75c4b6cb914 at 1.26, 2010-09-11 17:24:37-04:00, stenn at deacon.udel.edu +0 -0
        Auto merged
        MERGE: 1.7.16.2
    
      BitKeeper/deleted/.del-sntp.html~ca24a75c4b6cb914 at 1.7.16.2, 2010-09-11 17:24:34-04:00, stenn at deacon.udel.edu +0 -0
        Merge rename: sntp/sntp.html -> BitKeeper/deleted/.del-sntp.html~ca24a75c4b6cb914
    
      ChangeLog at 1.615, 2010-09-11 17:34:04-04:00, stenn at deacon.udel.edu +9 -2
        Merge cleanup
        MERGE: 1.496.26.83
    
    ChangeSet at 1.2082.4.113, 2010-09-11 06:50:03+00:00, stenn at deacon.udel.edu +27 -0
      NTP_4_2_6P3_BETA1
      TAG: NTP_4_2_6P3_BETA1
    
      ChangeLog at 1.496.26.83, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +1 -0
        NTP_4_2_6P3_BETA1
    
      ntpd/ntpd-opts.c at 1.248.16.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      ntpd/ntpd-opts.h at 1.248.16.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +3 -3
        NTP_4_2_6P3_BETA1
    
      ntpd/ntpd-opts.texi at 1.246.16.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      ntpd/ntpd.1 at 1.246.16.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      ntpdc/ntpdc-opts.c at 1.244.16.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      ntpdc/ntpdc-opts.h at 1.244.16.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +3 -3
        NTP_4_2_6P3_BETA1
    
      ntpdc/ntpdc-opts.texi at 1.243.16.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      ntpdc/ntpdc.1 at 1.243.16.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      ntpq/ntpq-opts.c at 1.245.16.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      ntpq/ntpq-opts.h at 1.245.16.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +3 -3
        NTP_4_2_6P3_BETA1
    
      ntpq/ntpq-opts.texi at 1.244.16.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      ntpq/ntpq.1 at 1.244.16.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      ntpsnmpd/ntpsnmpd-opts.c at 1.123.17.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      ntpsnmpd/ntpsnmpd-opts.h at 1.123.17.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +3 -3
        NTP_4_2_6P3_BETA1
    
      ntpsnmpd/ntpsnmpd-opts.texi at 1.123.17.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      ntpsnmpd/ntpsnmpd.1 at 1.122.17.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      packageinfo.sh at 1.255.18.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +3 -3
        NTP_4_2_6P3_BETA1
    
      sntp/sntp-opts.c at 1.117.16.1, 2010-09-11 06:50:01+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      sntp/sntp-opts.h at 1.117.16.1, 2010-09-11 06:50:02+00:00, stenn at deacon.udel.edu +3 -3
        NTP_4_2_6P3_BETA1
    
      sntp/sntp-opts.texi at 1.117.16.1, 2010-09-11 06:50:02+00:00, stenn at deacon.udel.edu +1 -1
        NTP_4_2_6P3_BETA1
    
      sntp/sntp.1 at 1.117.16.1, 2010-09-11 06:50:02+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      sntp/sntp.html at 1.7.16.1, 2010-09-11 06:50:02+00:00, stenn at deacon.udel.edu +1 -1
        NTP_4_2_6P3_BETA1
    
      util/ntp-keygen-opts.c at 1.247.16.1, 2010-09-11 06:50:02+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      util/ntp-keygen-opts.h at 1.247.16.1, 2010-09-11 06:50:02+00:00, stenn at deacon.udel.edu +3 -3
        NTP_4_2_6P3_BETA1
    
      util/ntp-keygen-opts.texi at 1.246.16.1, 2010-09-11 06:50:02+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    
      util/ntp-keygen.1 at 1.246.16.1, 2010-09-11 06:50:02+00:00, stenn at deacon.udel.edu +2 -2
        NTP_4_2_6P3_BETA1
    


More information about the commitlogs mailing list