Hello Junio, Junio C Hamano wrote: > Uwe Kleine-König <ukleinek@xxxxxxxxxxxxxxxxxxxxxxxxxx> writes: > > > Anyhow, the failure still exists, even though the original report was > > sent when rerere was still a perl script ... > > > > zeisberg@cassiopeia:/tmp/rerere$ git init > > Initialized empty Git repository in .git/ > > zeisberg@cassiopeia:/tmp/rerere$ mkdir .git/rerere > > This should be creating .git/rr-cache, but what you said in your > message is correct regardless. You're right. copy-n-paste error. > > In my eyes the last command should have recorded the resolution for > > lolo, shouldn't it? > > I think two-file merge (ancestor did not have it, and you and he > added the path differently) is rare enough that it was dropped > outside of the radar. A fix would probably be a trivial change > to builtin-rerere.c::find_conflict(), I think. While it would > still be sane to insist that we do not do rerere for symlinks, > and require to have stages #2 and #3, we should be able to drop > the requirement to have stage #1. rerere does not use > information from there anyway. > > Not even compile tested, but something like this should do. It compiles, but seems not to work. I will try to make up a test. Best regards Uwe -- Uwe Kleine-König http://www.google.com/search?q=5+choose+3 - 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
