• unknown's avatar
    Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files. · a250e2b4
    unknown authored
    They had been introduced in 5.1 and were only later backported to 5.0;
    as a consequence, the files in the 5.1 tree do not depend on the 5.0 ones,
    and changes in 5.0 do not propagate into the 5.1 files.
    
    To fix this, the (previous) files in 5.1 now are deleted ("bk rm"),
    and the previously deleted files depending on 5.0 are now moved to the 
    respective source directories ("bk mv").
    The current 5.1 contents is restored in these files.
    
    If you need the previous history of the 5.1 files ("bk revtool"),
    access those in "BitKeeper/deleted".
    
    Contrary to the original plan, I did not introduce the name
    "CMakeLists.historic" - mostly in order not to clutter the source tree.
    
    This fixes bug#29982.
    
    
    BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b:
      Delete: client/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4:
      Delete: CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~93f0d646:
      Delete: dbug/CMakeLists.txt
    dbug/CMakeLists.txt:
      Rename: BitKeeper/deleted/.del-CMakeLists.txt~9 -> dbug/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~57492bba:
      Delete: extra/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~8c35983c:
      Delete: extra/yassl/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~c3563d5f:
      Delete: extra/yassl/taocrypt/CMakeLists.txt
    extra/yassl/CMakeLists.txt:
      Rename: BitKeeper/deleted/.del-CMakeLists.txt~11 -> extra/yassl/CMakeLists.txt
    extra/yassl/taocrypt/CMakeLists.txt:
      Rename: BitKeeper/deleted/.del-CMakeLists.txt~12 -> extra/yassl/taocrypt/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~99a50df6:
      Delete: libmysql/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~86a68ea1:
      Delete: mysys/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~9e206e11:
      Delete: regex/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~95969b72:
      Delete: server-tools/instance-manager/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~fdec1f01:
      Delete: sql/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~1960eb07:
      Delete: storage/innobase/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~96726c3b:
      Delete: storage/myisam/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~bb293bb4:
      Delete: storage/heap/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~5fa65a12:
      Delete: strings/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~fb3a3a47:
      Delete: storage/myisammrg/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~fc201a06:
      Delete: tests/CMakeLists.txt
    tests/CMakeLists.txt:
      Rename: BitKeeper/deleted/.del-CMakeLists.txt~5 -> tests/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~2a609d33:
      Delete: vio/CMakeLists.txt
    vio/CMakeLists.txt:
      Rename: BitKeeper/deleted/.del-CMakeLists.txt~6 -> vio/CMakeLists.txt
    BitKeeper/deleted/.del-CMakeLists.txt~ef945345:
      Delete: zlib/CMakeLists.txt
    zlib/CMakeLists.txt:
      Rename: BitKeeper/deleted/.del-CMakeLists.txt~8 -> zlib/CMakeLists.txt
    CMakeLists.txt:
      Restore the current 5.1 contents into the 5.0-dependent file.
      
      For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
    client/CMakeLists.txt:
      Restore the current 5.1 contents into the 5.0-dependent file.
      
      For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
    extra/CMakeLists.txt:
      Restore the current 5.1 contents into the 5.0-dependent file.
      
      For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
    libmysql/CMakeLists.txt:
      Restore the current 5.1 contents into the 5.0-dependent file.
      
      For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
    mysys/CMakeLists.txt:
      Restore the current 5.1 contents into the 5.0-dependent file.
      
      For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
    regex/CMakeLists.txt:
      Restore the current 5.1 contents into the 5.0-dependent file.
      
      For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
    server-tools/instance-manager/CMakeLists.txt:
      Restore the current 5.1 contents into the 5.0-dependent file.
      
      For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
    sql/CMakeLists.txt:
      Restore the current 5.1 contents into the 5.0-dependent file.
      
      For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
    storage/heap/CMakeLists.txt:
      Restore the current 5.1 contents into the 5.0-dependent file.
      
      For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
    storage/innobase/CMakeLists.txt:
      Restore the current 5.1 contents into the 5.0-dependent file.
      
      For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
    storage/myisam/CMakeLists.txt:
      Restore the current 5.1 contents into the 5.0-dependent file.
      
      For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
    storage/myisammrg/CMakeLists.txt:
      Restore the current 5.1 contents into the 5.0-dependent file.
      
      For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
    strings/CMakeLists.txt:
      Restore the current 5.1 contents into the 5.0-dependent file.
      
      For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
    a250e2b4
CMakeLists.txt 2.22 KB