# 
# patch "ChangeLog"
#  from [9f4a2229c71435605004d1bb96fff88c66a233bc]
#    to [e591e7b1a3be1717139355c04e40404d5ba47362]
# 
# patch "commands.cc"
#  from [76f0fb24681d29b16c1bbde305b53763c617a86e]
#    to [f240a4cf1fa75ef50e3fe777705b7b8a2c973997]
# 
========================================================================
--- ChangeLog	9f4a2229c71435605004d1bb96fff88c66a233bc
+++ ChangeLog	e591e7b1a3be1717139355c04e40404d5ba47362
@@ -1,8 +1,12 @@
+2005-09-01  Matthew Gregan  <address@hidden>
+
+	* commands.cc (ALIAS(import, setup)): Remove alias.
+
 2005-09-01  Matt Johnston  <address@hidden>
 
-  * schema.sql: add BEGIN, COMMIT to make it a single transaction,
-  improves db init performance significantly on OS X (avoids many
-  disk-cache flushes).
+	* schema.sql: add BEGIN, COMMIT to make it a single transaction,
+	improves db init performance significantly on OS X (avoids many
+	disk-cache flushes).
 
 2005-09-01  Matthew Gregan  <address@hidden>
 
@@ -22,9 +26,10 @@
 
 2005-08-31  Richard Levitte  <address@hidden>
 
-	* lua.cc, std_hooks.lua: Rename monotone_guess_binary_filename_for_lua
-	and guess_binary_filename to monotone_guess_binary_file_contents_for_lua
-	and guess_binary_file_contents.
+	* lua.cc, std_hooks.lua: Rename
+	monotone_guess_binary_filename_for_lua and guess_binary_filename
+	to monotone_guess_binary_file_contents_for_lua and
+	guess_binary_file_contents.
 
 2005-08-31  Nathaniel Smith  <address@hidden>
 
@@ -36,16 +41,6 @@
 
 	* file_io.cc (walk_tree): Fixed format.
 
-	Someone should fix these new warnings for ppl with signed chars.
-
-	In function void set_char_is_binary(char, bool)
-	133: warning: array subscript has type char
-	In function void init_char_is_binary()
-	147: warning: comparison between signed and unsigned integer expressions
-	In function bool guess_binary(const std::string&)
-	160: warning: comparison between signed and unsigned integer expressions
-	162: warning: array subscript has type char
-
 2005-08-31  Marcel van der Boom  <address@hidden>
 
 	* std_hooks.lua (execute_confirm): New function.
========================================================================
--- commands.cc	76f0fb24681d29b16c1bbde305b53763c617a86e
+++ commands.cc	f240a4cf1fa75ef50e3fe777705b7b8a2c973997
@@ -3731,8 +3731,6 @@
   put_revision_id(null);
 }
 
-ALIAS(import, setup);
-
 CMD(automate, N_("automation"),
     N_("interface_version\n"
       "heads [BRANCH]\n"