# 
# patch "cvs_sync.cc"
#  from [74f67e37133ba97225457ac6d5e1c0ba8205ee8c]
#    to [41e0318022da8a3d58c194fe481a77e58a0e2478]
# 
# patch "options.hh"
#  from [8317f4ba20c3b8980707d2f330efe2d96b5b3dbc]
#    to [42c36f250184080c4005a60d6ad390082ff347a0]
# 
========================================================================
--- cvs_sync.cc	74f67e37133ba97225457ac6d5e1c0ba8205ee8c
+++ cvs_sync.cc	41e0318022da8a3d58c194fe481a77e58a0e2478
@@ -1884,7 +1884,7 @@
   }
   test_key_availability(app);
   cvs_sync::cvs_repository repo(app,root,module,false);
-  // 2DO: validate directory to match the structure
+  // FIXME: validate directory to match the structure
   repo.takeover();
 }
 
========================================================================
--- options.hh	8317f4ba20c3b8980707d2f330efe2d96b5b3dbc
+++ options.hh	42c36f250184080c4005a60d6ad390082ff347a0
@@ -30,7 +30,6 @@
 #define OPT_ALL_FILES 21
 #define OPT_PIDFILE 22
 #define OPT_MSGFILE 23
-#define OPT_SINCE 99 // use a custom number ...
 #define OPT_BRIEF 24
 #define OPT_DIFFS 25
 #define OPT_NO_MERGES 26
@@ -44,3 +43,4 @@
 #define OPT_EXTERNAL_DIFF_ARGS 34
 #define OPT_LCA 35
 #define OPT_EXECUTE 36
+#define OPT_SINCE 37