Junio C Hamano <gitster@xxxxxxxxx> wrote: > Pieter de Bie <pdebie@xxxxxxxxx> writes: > > > According to the git-fast-import man-page, you can only put a single > > committish per merge: line, like this: > > > > merge :10 > > merge :11 > > > > However, git-fast-export puts all parents on a single line, like this: > > > > merge :10 :11 > > > > This may be fine with git-fast-import,... > > Is it fine for even git-fast-import? fast-import.c: parse_merge() seems > to suggest that it also wants one parent per "merge " line. fast-import wants the same as bzr-fast-import; one parent per merge line. If git-fast-import was doing anything with multiple per line it was probably dropping everything after the first. :-( This was a bug in fast-export; I'm glad Pieter has fixed it. -- Shawn. -- 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
