# # # patch "mtn_cvs/cvs_sync.cc" # from [040853bce5662fb9ec02646d9174fb254f7e680d] # to [ae9918f30da11915e062e8f8ad15d088bedd25a2] # ============================================================ --- mtn_cvs/cvs_sync.cc 040853bce5662fb9ec02646d9174fb254f7e680d +++ mtn_cvs/cvs_sync.cc ae9918f30da11915e062e8f8ad15d088bedd25a2 @@ -1031,7 +1031,6 @@ } } } -#endif std::set::iterator cvs_repository::commit_mtn2cvs( std::set::iterator parent, const revision_id &rid, bool &fail) @@ -1200,6 +1199,7 @@ fail=true; return edges.end(); } +#endif std::string cvs_repository::gather_merge_information(revision_id const& id) { std::set parents;