On Thu, Apr 14, 2005 at 05:58:25PM -0700, Junio C Hamano wrote: > > I do like, however, the idea of separating the step of doing any > checkout/merge etc. and actually doing them. So the command set > of parse-your-output needs to be defined. Based on what I have > done so far, it would consist of the following: > > - Result is this object $SHA1 with mode $mode at $path (takes > one of the trees); you can do update-cache --cacheinfo (if > you want to muck with dircache) or cat-file blob (if you want > to get the file) or both.
Is that SHA1 for tree or the file object? If it is tree it don't need the $mode any more. If it is file you might need to emit entry for it's parent directory, including the modes of directory. > > - Result is to delete $path. > > - Result is a merge between object $SHA1-1 and $SHA1-2 with > mode $mode-1 or $mode-2 at $path. > > Would this be a good enough command set? And of course error/command for the files that unable to perform auto merge. including information of both revisions. That needs to be defined as well. Chris - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
