# 
# patch "ChangeLog"
#  from [d5a865845e51cadfbb72763df4733e87b86879ba]
#    to [7a9ca5d74088715616099d388917675eac84bb81]
# 
# patch "commands.cc"
#  from [e70ede39de672a6bc765a280a1f761010b5eee2b]
#    to [4bcc49cf342a1945317e235e5cdb8daabab0fa3f]
# 
# patch "contrib/monoprof.sh"
#  from [31ffb28c2699d07a11388fcc62e3790e23270b67]
#    to [fcc93c63e574e19fd070511b33fb475aef35ccc0]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2005-06-27  Timothy Brownawell  <address@hidden>
+
+	* commands.cc: living_status::merge was missing a line.
+	* contrib/monoprof.sh: add profile test for pcdv
+
 2005-06-16  Timothy Brownawell  <address@hidden>
 
 	* commands.cc: Beginnings of precise-cdv merge, as "pcdv" command.
--- commands.cc
+++ commands.cc
@@ -3982,6 +3982,7 @@
     for (map<string, vector<string> >::const_iterator i
          = other.overrides.begin(); i != other.overrides.end(); ++i)
       {
+        newdict.insert(*i);
         map<string, vector<string> >::const_iterator j
             = overrides.find(i->first);
         I(j == overrides.end() || j->second == i->second);
@@ -4381,14 +4382,14 @@
               cout<<"<<<<<<<<<<"<<'\n';
               for (vector<string>::iterator j = i->left.begin();
                    j != i->left.end(); ++j)
-                cout<<*j;
+                cout<<" "<<*j;
             }
           if (i->right.size())
             {
               cout<<">>>>>>>>>"<<'\n';
               for (vector<string>::iterator j = i->right.begin();
                    j != i->right.end(); ++j)
-                cout<<*j;
+                cout<<" "<<*j;
             }
           lastok = false;
         }
@@ -4400,7 +4401,7 @@
                 cout<<"=========="<<'\n';
               for (vector<string>::iterator j = i->left.begin();
                    j != i->left.end(); ++j)
-                cout<<*j;
+                cout<<" "<<*j;
             }
           lastok = true;
         }
--- contrib/monoprof.sh
+++ contrib/monoprof.sh
@@ -373,6 +373,22 @@
 	popd
 }
 
+TESTS="${TESTS} pcdv"
+test_name()
+{
+	local TESTNAME="pcdv"
+	local SHORTNAME="pcdv"
+#setup:
+	pushd ${BUILDDIR}
+	profstart
+#run:	
+	mtn pcdv 01b72a38e45356d4df0525aec6562e1a6acbf1e1 \
+		53b169c41e5d509dc2bd6d6977e6582ccf78b86d HACKING
+	profend
+#cleanup:
+	popd
+}
+
 #TESTS="${TESTS} test_name"
 #test_name()
 #{