On Mon, Dec 10, 2007 at 11:22:05AM -0800, Junio C Hamano wrote: > Finn Arne Gangstad <finnag@xxxxxxx> writes: > > > Instead of dying with weird errors when trying to merge submodules from a > > supermodule, emit errors that show what the problem is. > > Thanks. > > Your change to merge-one-file.sh is Ok, although I'd reword the message > a bit, and fold it as a new case arm to the existing case statement > immediately above. > [...] > merge-recursive did not support merging trees that have conflicting > changes in submodules they contain, and died. Support it exactly the > same way as how it handles conflicting symbolic link changes --- mark it > as a conflict, take the tentative result from the current side, and > letting the caller resolve the conflict, without dying in merge_file() > function. > [...] Your patch is obviously much nicer than the one I sent in, so please put it in if/when convenient! On another note, has there been any though to get merge to support sub-module merging properly? It seems like it should be possible (and it would make submodules a lot more useful) - Finn Arne - 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
