# 
# patch "ChangeLog"
#  from [937199b956cf78d6a0d50855cec7d32e8cec97ed]
#    to [021aa9c4dcbd669198cd376de1893d819153c627]
# 
# patch "contrib/monotone-import.pl"
#  from [936971f03dcd0f03c175973cddb9387c2bf1cb59]
#    to [d51a87380e1d820c4311a361a155bd56f50afa24]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,9 @@
+2005-06-30  Eric Kidd  <address@hidden>
+
+	* contrib/monotone-import.pl: Changed $branch to
+	$user_branch.  This script may need more work, but at least Perl
+	compiles it now.
+
 2005-06-30  Patrick Mauritz  <address@hidden>
 
 	* automate.cc, basic_io.hh, cert.cc, change_set.cc,
--- contrib/monotone-import.pl
+++ contrib/monotone-import.pl
@@ -198,7 +198,7 @@
 print "If you want the changes that come with the import to appear in\n";
 print "another branch (like your development branch), do the following\n";
 print "\n";
-print "monotone$database propagate $branch {your-chosen-branch}\n";
+print "monotone$database propagate $user_branch {your-chosen-branch}\n";
 print "**************************************\n";
 
 ######################################################################