# 
# 
# patch "AUTHORS"
#  from [1637b52f3099548855d1f30868e21e46ffc132b4]
#    to [3fe713cf4e93ee6c3dd77e61517b9416f5da8431]
# 
# patch "ChangeLog"
#  from [778d2f83be01d4ea33e1d15b471300c63414265e]
#    to [33ca0c0f24f73988cc4ebb3683b906f6906c0701]
# 
============================================================
--- AUTHORS	1637b52f3099548855d1f30868e21e46ffc132b4
+++ AUTHORS	3fe713cf4e93ee6c3dd77e61517b9416f5da8431
@@ -78,6 +78,7 @@ contributing authors, including:
   Jeronimo Pellegrini <address@hidden>
   Thomas Moschny <address@hidden>
   Zack Weinberg <address@hidden>
+  Markus Schiltknecht <address@hidden>
 
 Several people have also contributed to the translation of monotone
 into non-English languages; their work is available in the po/
============================================================
--- ChangeLog	778d2f83be01d4ea33e1d15b471300c63414265e
+++ ChangeLog	33ca0c0f24f73988cc4ebb3683b906f6906c0701
@@ -4353,11 +4353,6 @@ 2006-04-07  Richard Levitte  <address@hidden
 
 	* po/sv.po: A few untranslated ones appeared.
 
-2006-04-07  Markus Schiltknecht  <address@hidden>
-
-	* ChangeLog: Reinserted lost entries which got lost
-	during propagation.
-
 2006-04-07  Richard Levitte  <address@hidden>
 
 	* po/sv.po: Fixed a fuzzy.
@@ -4518,18 +4513,6 @@ 2006-04-07  Satoru SATOH <address@hidden
 
 	* po/ja.po: Updated Japanese translation.
 
-2006-04-06  Markus Schiltknecht  <address@hidden>
-
-	* rcs_import.cc: Moved cvs_event::operator< out of the
-	struct definition.
-	Now calling 'note_branchpoint' and adding a branch event
-	only if curr_commit is alive. Likewise with
-	note_commit_following_branchpoint
-
-	* tests/t_cvsimport_branch.at, tests/t_cvsimport_branch2.at:
-	added sleeps to allow cvs_import to distinguish branches
-	and commits by their timestamp.
-
 2006-04-06  Richard Levitte  <address@hidden>
 
 	* ui.cc (user_interface::output_prefix): Move the invariant
@@ -4541,16 +4524,6 @@ 2006-04-06  Richard Levitte  <address@hidden
 	In user_interface::output_prefix, still check if prog_name is
 	empty, and output something harmless if it is.
 
-2006-04-06  Markus Schiltknecht  <address@hidden>
-
-	* rcs_import.cc: Added the real branch time detection logic
-	and fixed some bugs in the previous commit.
-
-2006-04-06  Markus Schiltknecht  <address@hidden>
-
-	* rcs_import.cc: Improved branch time detection and some debug
-	messages.
-
 2006-04-05  Nathaniel Smith  <address@hidden>
 
 	* NEWS: Start writing 0.26 release notes.
@@ -4623,43 +4596,6 @@ 2006-04-05  Lapo Luchini  <address@hidden>
 
 	* po/it.po: Changed "in/out" translations as graphical arrows.
 
-2006-04-04  Markus Schiltknecht  <address@hidden>
-
-	* rcs_import.cc: bracking the branch assocciated
-	with cvs_event and cvs_cluster.
-	In the cluster_consumer, we then connect the branch
-	to the previous revision id.
-
-2006-04-04  Markus Schiltknecht  <address@hidden>
-
-	* rcs_import.cc: removed cvs_cluster.first_time in
-	favour of start_time and end_time. This later allows
-	checking for overlapping commits.
-
-2006-04-04  Markus Schiltknecht  <address@hidden>
-
-	* rcs_import.cc: add has_parent_rid and parent_rid
-	variables to cvs_branch. Import branches with an
-	associated parent revision first.
-	And added the branch connecting code from my
-	previous try to connect branches.
-
-2006-04-04  Markus Schiltknecht  <address@hidden>
-
-	* rcs_import.cc: modified import order: importing the
-	trunk first, then all branches. This in preparation
-	for branch reconstruction
-
-2006-04-04  Markus Schiltknecht  <address@hidden>
-
-	* rcs_import.cc: added step 4: find the last cvs_cluster
-	for ET_BRANCH events.
-
-2006-04-04  Markus Schiltknecht  <address@hidden>
-
-	* rcs_import.cc: added type info to cvs_cluster so a
-	cvs_cluster can now be a commit or a branchpoint.
-
 2006-04-04  Matt Johnston  <address@hidden>
 
 	* tests/t_rosterify_empty_manifest.at: a test for rosterifying a db
@@ -4763,13 +4699,6 @@ 2006-04-01  Petr Ovtchenkov  <ptr at isl
 
 	* xdelta.cc: avoid dereference of iterators at end()
 
-2006-03-31  Markus Schiltknecht  <address@hidden>
-
-	* tests/t_cvsimport_branch2.at: New test to check for cvsimport
-	to correctly links branches.
-
-	* testsuite.at: Add the above test.
-
 2006-03-31  Nathaniel Smith  <address@hidden>
 
 	* work.cc (apply_delta): Don't print file hashes when updating.