Junio C Hamano, Fri, Nov 14, 2008 01:29:34 +0100: > "Anders Melchiorsen" <mail@xxxxxxxxxxxxxxxx> writes: > > > Your patch got rid of the errors and it commits the merged tree. But the > > working tree is not updated correctly, so the moved file disappears. > > Isn't this a long known breakage of D/F conflict check logic in > merge-recursive backend? Could be, but there is no conflicting entries in the merged branches. All file names are different and the D/F transition happens completely on one branch. And the patch isn't enough: the file Anders noticed missing is in the index (correctly) but somehow removed from worktree. Which is maybe because it _still_ was a rename: 99% similarity. Well, just "yes | tail -nNN" usually producess very similar data :) Still broken, of course... -- 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
