# 
# patch "packet.cc"
#  from [4d1e28798820d2902092b64f87179f3c5754ce37]
#    to [a39402aafb0ec789aa2b8b03689d9787260885b6]
# 
# patch "rcs_import.cc"
#  from [044c14ab0ebb2610e10bcb9c28e39b517ad2c88e]
#    to [3920e37253b081cba66a26cb685da63f824d3bb7]
# 
--- packet.cc
+++ packet.cc
@@ -669,7 +669,7 @@
 
 void 
 packet_db_writer::consume_file_reverse_delta(file_id const & new_id,
-                                             file_id const & old_id,                                         
+                                             file_id const & old_id,
                                              file_delta const & del)
 {
   transaction_guard guard(pimpl->app.db);
--- rcs_import.cc
+++ rcs_import.cc
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "gnu"; indent-tabs-mode: nil -*-
 // copyright (C) 2002, 2003, 2004 graydon hoare <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
@@ -588,7 +589,7 @@
       thus, we give up on establishing a hierarchy between branches
       altogether. all branches exist in a flat namespace, and all are
       direct descendents of the empty revision at the root of
-      history. each branchpoint symbol mentionned in the
+      history. each branchpoint symbol mentioned in the
       administrative section of a file is considered the root of a new
       lineage.