# 
# delete_file "fsck.cc"
# 
# delete_file "fsck.hh"
# 
# delete_file "tests/t_fsck.at"
# 
# patch "database.hh"
#  from [2d3eebe2d068fe59907c2a5c660a66d9eba93a77]
#    to [794783807386029f0a6d8067e2a7bb0eba88b0a2]
# 
# patch "main.cc"
#  from [1eff4db78605adee1ef7261417bde7afca407fa6]
#    to [f5427f1b85d11caddbc2732f049250698bbdb6c3]
# 
# patch "monotone.1"
#  from [cd8c273bcfcd6f020ca6de0abc899b5f6f5b27a5]
#    to [8a4615b38f6f7ed8ed160f0609f40d7336bb0859]
# 
# patch "tests/t_netsync_unrelated.at"
#  from [126a8b13399e2b0adfe1dc8fcebdb82aecc7d138]
#    to [61ec68db6f63d56d79e65780048c527e27e7c737]
# 
# patch "ui.cc"
#  from [04baa46b04ab5e5bbbced3b727de1ca2d30560b3]
#    to [b06e19535d68d00f01c8ab33848e79f1942c9532]
# 
# patch "work.hh"
#  from [b94e42f0150b2f7fe4940e821038f2b7c61f1e6a]
#    to [41939ab23e00e777cc07da3df1b31a74082c0ae8]
# 
--- database.hh
+++ database.hh
@@ -290,8 +290,6 @@
 
   void delete_existing_rev_and_certs(revision_id const & rid);
 
-  void delete_existing_rev_and_certs(revision_id const & rid);
-
   // crypto key / cert operations
 
   void get_key_ids(std::string const & pattern,
--- main.cc
+++ main.cc
@@ -261,7 +261,6 @@
     struct sigaction old_SIGSEGV_action;
     struct sigaction old_SIGBUS_action;
     struct sigaction old_SIGABRT_action;
-    struct sigaction old_SIGPIPE_action;
 
     all_signals_action.sa_flags   = 0;
     all_signals_action.sa_handler = &unix_style_signal_handler;
@@ -273,13 +272,6 @@
     sigaction(SIGBUS , &all_signals_action, &old_SIGBUS_action);
     sigaction(SIGABRT, &all_signals_action, &old_SIGABRT_action);
 
-    // We want to ignore SIGPIPE for netxx
-    struct sigaction ignore_signals_action;
-    ignore_signals_action.sa_flags   = 0;
-    ignore_signals_action.sa_handler = SIG_IGN;
-    sigemptyset(&ignore_signals_action.sa_mask);
-    sigaction(SIGPIPE, &ignore_signals_action, &old_SIGPIPE_action);
-
     int result = 0;
     bool trapped_signal = false;
     char const *em = NULL;
@@ -319,7 +311,6 @@
     sigaction(SIGSEGV, &old_SIGSEGV_action, sigaction_ptr());
     sigaction(SIGBUS , &old_SIGBUS_action , sigaction_ptr());
     sigaction(SIGABRT, &old_SIGABRT_action, sigaction_ptr());
-    sigaction(SIGPIPE, &old_SIGPIPE_action, NULL);
     
     if(trapped_signal) 
       throw unix_signal_exception(em);
--- monotone.1
+++ monotone.1
@@ -277,17 +277,6 @@
 committing a new revision, rather than the current time.  Useful when
 importing history from another version control system.
 .TP
-\fB--author=\fI<author email>\fP
-Use the given author as the value of the "author" cert when committing
-a new revision, rather than the default author.  Useful when
-committing a patch on behalf of someone else, or when importing
-history from another version control system.
-.TP
-\fB--date=\fI<date and time>\fP
-Use the given given date and time as value of the "date" cert when
-committing a new revision, rather than the current time.  Useful when
-importing history from another version control system.
-.TP
 \fB--root=\fI<root dir>\fP
 Stop the search for a working copy (containing the @file{MT} directory)
 at the specified root directory rather than at the physical root of the
--- tests/t_netsync_unrelated.at
+++ tests/t_netsync_unrelated.at
@@ -16,12 +16,6 @@
 # mentioned there; doing sideways deltas between heads, all sorts of
 # possibilities for maybe-efficient algorithms.
 
-# For analysis and discussion of solutions, see:
-#   http://lists.gnu.org/archive/html/monotone-devel/2004-11/msg00043.html
-# There are other strategies that might be good besides the one
-# mentioned there; doing sideways deltas between heads, all sorts of
-# possibilities for maybe-efficient algorithms.
-
 # This test is a bug report.
 AT_XFAIL_IF(true)
 
--- ui.cc
+++ ui.cc
@@ -125,14 +125,6 @@
       tickline.resize(tw + 1);
     }
 
-  unsigned int tw = terminal_width();
-  if (tw && tickline.size() > tw)
-    {
-      // first character in tickline is "\r", which does not take up any
-      // width, so we add 1 to compensate.
-      tickline.resize(tw + 1);
-    }
-
   clog << tickline;
   clog.flush();
 }
--- work.hh
+++ work.hh
@@ -84,8 +84,6 @@
 
 bool has_contents_user_log();
 
-bool has_contents_user_log();
-
 // the "options map" is another administrative file, stored in
 // MT/options. it keeps a list of name/value pairs which are considered
 // "persistent options", associated with a particular the working copy and