# 
# 
# patch "ChangeLog"
#  from [861f78539ed74aae75ba0838616ab6c48ed3868b]
#    to [22a22820f14469ec3734107d73b32737ee4f3b1c]
# 
============================================================
--- ChangeLog	861f78539ed74aae75ba0838616ab6c48ed3868b
+++ ChangeLog	22a22820f14469ec3734107d73b32737ee4f3b1c
@@ -1,3 +1,8 @@
+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.
@@ -142,6 +147,10 @@
 
 	* NEWS: Complete (?) draft of 0.26 release notes.
 
+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
@@ -154,10 +163,6 @@
 	added sleeps to allow cvs_import to distinguish branches
 	and commits by their timestamp.
 
-2006-04-07  Satoru SATOH <address@hidden>
-
-	* po/ja.po: Updated Japanese translation.
-
 2006-04-06  Richard Levitte  <address@hidden>
 
 	* ui.cc (user_interface::output_prefix): Move the invariant
@@ -251,6 +256,44 @@
 
 	* 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
@@ -276,6 +319,10 @@
 
 	* po/sv.po: Updated and additional translations.
 
+2006-04-04  Markus Schiltknecht  <address@hidden>
+
+	* rcs_import.cc: Renamed cvs_commit to cvs_event
+
 2006-04-02  Matthew Nicholson  <address@hidden>
 
 	* contrib/get_passphrase_from_file.lua: Added.  This hook reads
@@ -315,6 +362,13 @@
 
 	* 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.
@@ -492,6 +546,21 @@
 	(build_roster_style_revs_from_manifest_style_revs): Call it.
 	* tests/t_rosterify_on_rosterified_db.at, testsuite.at: New test.
 
+2006-03-27  Matthew Gregan  <address@hidden>
+
+	* idna/nfkc.c, popt/popt.c, popt/popt.h, popt/popthelp.c: Warning
+	cleanups.
+
+2006-03-25  Matthew Gregan  <address@hidden>
+
+	* diff_patch.cc, hash_map.hh, lua/lua.h, mkstemp.cc, monotone.cc,
+	platform.hh, rcs_file.cc, sanity.hh, ui.cc, vocab.hh: config.h
+	cleanups--ensure it is included before any other includes, and
+	that we use "", rather than <>.
+
+	* idna/version.c: Use STRINGPREP_VERSION rather than VERSION,
+	which just happens to be defined to the monotone version number.
+
 2006-03-24  Richard Levitte  <address@hidden>
 
 	* po/sv.po: Corrected all the fuzzy translations