# # # patch "mtn_cvs/cvs_sync.cc" # from [c075c339379413887ec350b91ffcce81382f74e9] # to [22377d511a03361e62a5d699078b2d438bd3d215] # ============================================================ --- mtn_cvs/cvs_sync.cc c075c339379413887ec350b91ffcce81382f74e9 +++ mtn_cvs/cvs_sync.cc 22377d511a03361e62a5d699078b2d438bd3d215 @@ -1715,7 +1715,8 @@ void cvs_repository::update() if (cs.is_nontrivial()) { W(F("Committing update revision to fix inconsistencies.")); - W(F("WARNING: This is only papering over some other problem.")); + W(F("This is only covering up some other problem.")); + W(F("History information may have been lost.")); revision_id parent_rid = now.revision; @@ -1725,7 +1726,7 @@ void cvs_repository::update() app.cert_revision(child_rid, branch_cert_name_s, app.opts.branch_name()); app.cert_revision(child_rid, author_cert_name_s, "mtn_cvs"); - app.cert_revision(child_rid, changelog_cert_name_s, "mtn_cvs update to fix out-of-sync files.\nPossibly there is lost log information."); + app.cert_revision(child_rid, changelog_cert_name_s, "mtn_cvs update to fix out-of-sync files.\nPossibly there is lost history information."); app.cert_revision(child_rid, date_cert_name_s, time_t2monotone(now.time)); app.cert_revision(child_rid, sync_cert_name_s, app.opts.domain());