On Fri, 4 Sep 2009, Junio C Hamano wrote: > Daniel Barkalow <barkalow@xxxxxxxxxxxx> writes: > > > This is the next version of the db/vcs-helper series in pu. > > Thanks. > > > The first patch is new, a rework of the remote-curl build to produce > > "remote-curl" and call it as a special case for the sorts of URLs that > > we accept as indicating something that it now handled by this helper. > > > > The series is rebased onto current next, with some conflicts resolved. > > Because the theme of the topic does not have anything to do with fixing > the deepening of shallow clones nor giving an extended error message from > non-fast-forward git-push, I queued the series after reverse-rebasing onto > old db/vcs-helper~8, in order to keep the topic branch pure, instead of > merging unrelated topics from maint, master or next into it. The result > merged in 'pu' obviously has to match what you expected by applying the > patches on top of 'next', and I am reasonably sure it does. I'd thought that topics in pu were carried as based on next, particularly once they depend on something (e.g., the beginning of the series) in next. I suppose there's better options, but what do you do to find them? (Feel free to refer me to the "note from the maintainer" if it's there, but I don't remember that detail) FWIW, there was a semantic mismerge in the original basing of this series on 07a4a3b496, which I finally fixed in this version; the code to handle NULL urls in builtin-fetch was after a new conversion of the url. In any case, I think both the reverse-rebase and merge are correct. > > Two patches have been dropped: a memory leak fix for code that was > > removed entirely by the first patch, and the "mark" helper capability, > > which is not needed (I believe) due to the "option" fast-import command. > > Johan's cvs-helper series were depending on the previous iteration of this > series, but I thought it is being rerolled, so I'd drop it from pu for now. You could probably stick the "mark" patch into the start of the cvs-helper series until it gets rerolled if you want to keep that series in pu meanwhile; it was at the end of the series, and doesn't have subtle interactions or interact with anything that's changed. -Daniel *This .sig left intentionally blank* -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html