# 
# patch "cvs_repository.cc"
#  from [e6ff097b596516f574986b38fe9721a3a6e82207]
#    to [a980309ab3b9ab42e7ad7ee192831f69f8cf3340]
# 
# patch "tests/t_cvspull_separate.at"
#  from [d7d93af78a7245fd9da5c5e2bd2d5854aad4e004]
#    to [4dc62615cdad3133e2755884fdc3a6d11b723fec]
# 
--- cvs_repository.cc
+++ cvs_repository.cc
@@ -1322,7 +1322,11 @@
           fs.keyword_substitution=line.substr(slash+1,space-(slash+1));
         if (fs.cvs_version=="-") // delta encoded: remove
         { I(!e.delta_base.inner()().empty());
-          e.xfiles.insert(std::make_pair(path,remove_state));
+          fs.log_msg=e.changelog;
+          fs.author=e.author;
+          fs.dead=true;
+          cvs_file_state cfs=remember(files[path].known_states,fs);
+          e.xfiles.insert(std::make_pair(path,cfs)); // remove_state));
         }
         else
         { manifest_map::const_iterator iter_file_id=manifest.find(monotone_path);
--- tests/t_cvspull_separate.at
+++ tests/t_cvspull_separate.at
@@ -57,7 +57,6 @@
 AT_CHECK([cd test;sleep 1;cvs -Q ci -m 'B changed'])
 
 AT_CHECK(echo MONOTONE --branch=testbranch cvs_pull, [0], [ignore], [ignore])
-exit 1
 
 AT_CHECK(mkdir test/dir)
 AT_CHECK([cd test;cvs -Q add dir])