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

Harlan Stenn stenn at deacon.udel.edu
Tue Sep 21 05:19:02 UTC 2010


VAR       CLIENT              SERVER              
===       ======              ======              
USER      stenn               stenn               
HOST      deacon.udel.edu     pogo.udel.edu       
ROOT      /deacon/backroom/ntp-dev/pogo/users/hart/ntp-dev-1635
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.2198, 2010-09-20 23:22:02+00:00, davehart at shiny.ad.hartbrothers.com +1 -0
      Correct skipped merge of generated file ntp_parser.c
    
      ntpd/ntp_parser.c at 1.61, 2010-09-20 23:22:01+00:00, davehart at shiny.ad.hartbrothers.com +1174 -999
        Bison output of merged ntp_parser.y
    
    ChangeSet at 1.2197, 2010-09-20 23:09:50+00:00, davehart at shiny.ad.hartbrothers.com +5 -0
      Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1635
      into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1635
      MERGE: 1.2082.4.117
    
      ChangeLog at 1.632, 2010-09-20 23:09:49+00:00, davehart at shiny.ad.hartbrothers.com +5 -4
        routine
        MERGE: 1.496.26.86
    
      ntpd/ntp_config.c at 1.264, 2010-09-20 23:03:53+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Auto merged
        MERGE: 1.241.1.5
    
      ntpd/ntp_parser.c at 1.60, 2010-09-20 23:09:08+00:00, davehart at shiny.ad.hartbrothers.com +684 -1231
        not sanely mergable, regenerate
        MERGE: 1.52.1.3
    
      ntpd/ntp_parser.y at 1.55, 2010-09-20 23:03:53+00:00, davehart at shiny.ad.hartbrothers.com +0 -0
        Auto merged
        MERGE: 1.47.1.3
    
      ntpd/ntp_util.c at 1.83, 2010-09-20 23:03:53+00:00, davehart at shiny.ad.hartbrothers.com +0 -1
        Auto merged
        MERGE: 1.75.1.1
    
    ChangeSet at 1.2082.4.117, 2010-09-20 22:41:37+00:00, davehart at shiny.ad.hartbrothers.com +6 -0
      [Bug 1635] "filegen ... enable" is not default.
    
      ChangeLog at 1.496.26.86, 2010-09-20 22:41:35+00:00, davehart at shiny.ad.hartbrothers.com +4 -0
        [Bug 1635] "filegen ... enable" is not default.
    
      ntpd/ntp_config.c at 1.241.1.5, 2010-09-20 22:41:36+00:00, davehart at shiny.ad.hartbrothers.com +5 -2
        [Bug 1635] "filegen ... enable" is not default.
    
      ntpd/ntp_filegen.c at 1.18, 2010-09-20 22:41:36+00:00, davehart at shiny.ad.hartbrothers.com +5 -7
        nonfunctional cleanup (whitespace, use estrdup()).
    
      ntpd/ntp_parser.c at 1.52.1.3, 2010-09-20 22:41:36+00:00, davehart at shiny.ad.hartbrothers.com +383 -386
        Bison output for ntp_parser.y
    
      ntpd/ntp_parser.y at 1.47.1.3, 2010-09-20 22:41:36+00:00, davehart at shiny.ad.hartbrothers.com +4 -12
        [Bug 1635] "filegen ... enable" is not default.
    
      ntpd/ntp_util.c at 1.75.1.1, 2010-09-20 22:41:36+00:00, davehart at shiny.ad.hartbrothers.com +2 -2
        whitespace
    


More information about the commitlogs mailing list