Changeset 273

Show
Ignore:
Timestamp:
01/17/2007 06:11:37 PM
Author:
toby
Message:

* Merge /branches/Ken/restore-widetime (r266:272) back to trunk
* Delete said branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/script/Vss2Svn/ActionHandler.pm

    r263 r273  
    1313     MOVE       => \&_move_handler, 
    1414     RESTORE    => \&_restore_handler, 
     15     RESTOREDPROJECT    => \&_restore_handler, 
    1516     DELETE     => \&_delete_handler, 
    1617     RECOVER    => \&_recover_handler, 
  • trunk/script/vss2svn.pl

    r264 r273  
    534534    # on physname, actiontype, timestamp, and author gets us close. The problem 
    535535    # is that the "two" actions may not have happened in the exact same second, 
    536     # so we need to also look for any that are up to two seconds apart and hope 
     536    # so we need to also look for any that are some time apart and hope 
    537537    # we don't get the wrong row. 
    538538 
     
    548548    AND physname = ? 
    549549    AND actiontype = ? 
    550     AND (ABS(? - timestamp) < 21600) 
    551550    AND author = ? 
    552551ORDER BY 
    553     timestamp 
    554 EOSQL 
    555  
    556     # timestamp test is within 21600 seconds equals 6 hours (allows for 
    557     # really bad Windows clocks, timezones, and WAN delays) 
     552    ABS(? - timestamp) 
     553EOSQL 
     554 
    558555    my $sth = $gCfg{dbh}->prepare($sql); 
    559     $sth->execute( $parentdata, @{ $parentrec }{qw(physname actiontype timestamp author)} ); 
     556    $sth->execute( $parentdata, @{ $parentrec }{qw(physname actiontype author timestamp)} ); 
    560557 
    561558    return $sth->fetchall_arrayref( {} ); 
     
    13041301    # ==> map RollBack to BRANCH, so that we can join the two actions in the 
    13051302    # MergeParentData step 
    1306  
     1303    # RestoredProject seems to act like CreatedProject, except that the 
     1304    # project was recreated from an archive file, and its timestamp is 
     1305    # the time of restoration. Timestamps of the child files retain 
     1306    # their original values. 
    13071307    %gActionType = ( 
    13081308        CreatedProject => {type => 1, action => 'ADD'}, 
    13091309        AddedProject => {type => 1, action => 'ADD'}, 
     1310        RestoredProject => {type => 1, action => 'RESTOREDPROJECT'}, 
    13101311        RenamedProject => {type => 1, action => 'RENAME'}, 
    13111312        MovedProjectTo => {type => 1, action => 'MOVE'}, 
  • trunk/ssphys

    • Property svn:ignore changed from *.ncb *.opt *.bak *.suo tmp version.h bin to svn-* *.bak *.ncb *.opt *.suo .deps .libs aclocal.m4 autom4te.cache bin config.log config.status configure libtool Makefile Makefile.in ssphys svnwcrev.sh tmp version.h
  • trunk/ssphys/config

    • Property svn:ignore set to svn-* depcomp missing config.guess config.sub ltmain.sh install-sh
  • trunk/ssphys/utils/tinyxml.cpp

    r262 r273  
    2929#include <sstream> 
    3030#include <iostream> 
     31#include <iomanip> 
    3132#endif 
    3233 
     
    113114                else if (iscntrl (c)) // ( c < 32) 
    114115                { 
    115                         // Easy pass at non-alpha/numeric/symbol 
    116                         // Below 32 is symbolic. 
    117                         char buf[ 32 ]; 
     116                        std::cerr << "WARNING: control character 0x" 
     117                                        << std::hex << std::setw(2) << std::setfill('0') << (unsigned)c 
     118                                        << " in text input at character " 
     119                                        << std::dec << std::setw(0) << i 
     120                                        << std::endl; 
    118121                         
    119                         #if defined(TIXML_SNPRINTF)              
    120                                 TIXML_SNPRINTF( buf, sizeof(buf), "&#x%02X;", (unsigned) ( c & 0xff ) ); 
    121                         #else 
    122                                 sprintf( buf, "&#x%02X;", (unsigned) ( c & 0xff ) ); 
    123                         #endif           
    124  
    125                         //*ME:  warning C4267: convert 'size_t' to 'int' 
    126                         //*ME:  Int-Cast to make compiler happy ... 
    127                         outString->append( buf, (int)strlen( buf ) ); 
    128122                        ++i; 
    129123                } 

These ads are automatically generated by Google based on the content of this page. Revenue from these ads helps to pay for hosting fees of this site; however, these ads do not constitute an endorsement by PumaCode.org.