diff options
author | unknown <joerg@trift2.> | 2007-07-31 19:35:13 +0200 |
---|---|---|
committer | unknown <joerg@trift2.> | 2007-07-31 19:35:13 +0200 |
commit | a250e2b453475694451b0553622a9a6ab330e1a6 (patch) | |
tree | cdac3fc211f3b399c96dd44278a438ac15e499b6 | |
parent | 1aa6f24bd7aaad141ff768ca2e087acb5273d39e (diff) | |
download | mariadb-git-a250e2b453475694451b0553622a9a6ab330e1a6.tar.gz |
Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.
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".
-rwxr-xr-x[-rw-r--r--] | CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | client/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | dbug/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | extra/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | extra/yassl/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | extra/yassl/taocrypt/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | libmysql/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | mysys/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | regex/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | server-tools/instance-manager/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | sql/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | storage/heap/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | storage/innobase/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | storage/myisam/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | storage/myisammrg/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | strings/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | tests/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | vio/CMakeLists.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | zlib/CMakeLists.txt | 0 |
19 files changed, 0 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6395ae17a14..6395ae17a14 100644..100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 8a670cf4c4b..8a670cf4c4b 100644..100755 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt diff --git a/dbug/CMakeLists.txt b/dbug/CMakeLists.txt index 375fd19fb40..375fd19fb40 100644..100755 --- a/dbug/CMakeLists.txt +++ b/dbug/CMakeLists.txt diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index 1722c9da5f2..1722c9da5f2 100644..100755 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt index 5cc97f22a36..5cc97f22a36 100644..100755 --- a/extra/yassl/CMakeLists.txt +++ b/extra/yassl/CMakeLists.txt diff --git a/extra/yassl/taocrypt/CMakeLists.txt b/extra/yassl/taocrypt/CMakeLists.txt index baa8f97dff6..baa8f97dff6 100644..100755 --- a/extra/yassl/taocrypt/CMakeLists.txt +++ b/extra/yassl/taocrypt/CMakeLists.txt diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 7d4dcc1e919..7d4dcc1e919 100644..100755 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index 1ae625c4c03..1ae625c4c03 100644..100755 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt diff --git a/regex/CMakeLists.txt b/regex/CMakeLists.txt index 9b95c9d2bc6..9b95c9d2bc6 100644..100755 --- a/regex/CMakeLists.txt +++ b/regex/CMakeLists.txt diff --git a/server-tools/instance-manager/CMakeLists.txt b/server-tools/instance-manager/CMakeLists.txt index f8a8a7e57d0..f8a8a7e57d0 100644..100755 --- a/server-tools/instance-manager/CMakeLists.txt +++ b/server-tools/instance-manager/CMakeLists.txt diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index c792e10c3af..c792e10c3af 100644..100755 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt diff --git a/storage/heap/CMakeLists.txt b/storage/heap/CMakeLists.txt index f4732397cc4..f4732397cc4 100644..100755 --- a/storage/heap/CMakeLists.txt +++ b/storage/heap/CMakeLists.txt diff --git a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt index d2b6162ba26..d2b6162ba26 100644..100755 --- a/storage/innobase/CMakeLists.txt +++ b/storage/innobase/CMakeLists.txt diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt index ec7cde9a789..ec7cde9a789 100644..100755 --- a/storage/myisam/CMakeLists.txt +++ b/storage/myisam/CMakeLists.txt diff --git a/storage/myisammrg/CMakeLists.txt b/storage/myisammrg/CMakeLists.txt index b35638ac91d..b35638ac91d 100644..100755 --- a/storage/myisammrg/CMakeLists.txt +++ b/storage/myisammrg/CMakeLists.txt diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt index ac7c75ec56c..ac7c75ec56c 100644..100755 --- a/strings/CMakeLists.txt +++ b/strings/CMakeLists.txt diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5eade93621b..5eade93621b 100644..100755 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt diff --git a/vio/CMakeLists.txt b/vio/CMakeLists.txt index e4940d54da8..e4940d54da8 100644..100755 --- a/vio/CMakeLists.txt +++ b/vio/CMakeLists.txt diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt index ac315b0dd85..ac315b0dd85 100644..100755 --- a/zlib/CMakeLists.txt +++ b/zlib/CMakeLists.txt |