# # patch "git.cc" # from [413e41044dbf536b331235573e6f9d346da521dd] # to [7c23871b4f2cdf23b08251f8e56a4a878100f11f] # ======================================================================== --- git.cc 413e41044dbf536b331235573e6f9d346da521dd +++ git.cc 7c23871b4f2cdf23b08251f8e56a4a878100f11f @@ -9,7 +9,6 @@ // Sponsored by Google's Summer of Code and SuSE // TODO: -// * Incremental import // * Export, incremental export // * Non-master head // * Do not use external commands, but libgit directly (?) @@ -351,7 +350,7 @@ } // Look up given GIT commit id in present monotone history; -// this is used for incremental merging. Being smart, it also +// this is used for incremental import. Being smart, it also // populates the commitmap with GIT commits it finds along the way. static void historical_gitrev_to_monorev(git_history &git, app_state &app, @@ -557,7 +556,7 @@ manifest_id parent_mid; // given the topo order, we ought to have the parent hashed - except - // for incremental pulls + // for incremental imports map >::const_iterator i = git.commitmap.find(param); if (i != git.commitmap.end())