rerere fails to record resolution if file doesn't exist in merge base
Hello,
Some time ago, I sent a test for that[1], but the patch doesn't apply anymore.
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 zeisberg@cassiopeia:/tmp/rerere$ echo just something to commit > file zeisberg@cassiopeia:/tmp/rerere$ git add file zeisberg@cassiopeia:/tmp/rerere$ git commit -m 1 Created initial commit 51384cb: 1 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 file zeisberg@cassiopeia:/tmp/rerere$ git branch b zeisberg@cassiopeia:/tmp/rerere$ echo lala > lolo zeisberg@cassiopeia:/tmp/rerere$ git add lolo zeisberg@cassiopeia:/tmp/rerere$ git commit -m 2 Created commit 98b91cc: 2 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 lolo zeisberg@cassiopeia:/tmp/rerere$ git checkout b Switched to branch "b" zeisberg@cassiopeia:/tmp/rerere$ echo lali > lolo zeisberg@cassiopeia:/tmp/rerere$ git add lolo zeisberg@cassiopeia:/tmp/rerere$ git commit -m 2a Created commit bb900f3: 2a 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 lolo zeisberg@cassiopeia:/tmp/rerere$ git pull . master Auto-merged lolo CONFLICT (add/add): Merge conflict in lolo Automatic merge failed; fix conflicts and then commit the result. zeisberg@cassiopeia:/tmp/rerere$ perl -n -i -e "print if /^l/" lolo zeisberg@cassiopeia:/tmp/rerere$ cat lolo lali lala zeisberg@cassiopeia:/tmp/rerere$ git rerere zeisberg@cassiopeia:/tmp/rerere$
In my eyes the last command should have recorded the resolution for lolo, shouldn't it?
Best regards
Uwe
[1] http://article.gmane.org/gmane.comp.version-control.git/19267
Signature · 3 lines
Uwe Kleine-König http://www.google.com/search?q=1+stone%3D
Quoted 6 lines · Uwe Kleine-König
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.
Quoted 2 lines
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.
builtin-rerere.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-)
builtin-rerere.c +7 -10
@@ -168,19 +168,16 @@ static int find_conflict(struct path_list *conflict)int i;if (read_cache () <0 )return error ("Could not read index" ); -for (i =0 ; i +2 < active_nr; i++) { -struct cache_entry *e1 = active_cache[i]; -struct cache_entry *e2 = active_cache[i+1 ]; -struct cache_entry *e3 = active_cache[i+2 ]; -if (ce_stage (e1) ==1 && -ce_stage (e2) ==2 && +for (i =0 ; i+1 < active_nr; i++) { +struct cache_entry *e2 = active_cache[i]; +struct cache_entry *e3 = active_cache[i+1 ]; +if (ce_stage (e2) ==2 &&ce_stage (e3) ==3 && -ce_same_name (e1, e2) &&ce_same_name (e1, e3) && -S_ISREG (ntohl (e1->ce_mode)) && +ce_same_name (e2, e3) &&S_ISREG (ntohl (e2->ce_mode)) &&S_ISREG (ntohl (e3->ce_mode))) { -path_list_insert ((const char *)e1->name, conflict); - i +=2 ; +path_list_insert ((const char *)e2->name, conflict); + i++;/* skip over both #2 and #3 */ } }return 0 ;
Hello Junio,
Quoted 11 lines · Junio C Hamano
Quoted 6 lines · Uwe Kleine-König
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/rerereThis should be creating .git/rr-cache, but what you said in your message is correct regardless.
You're right. copy-n-paste error.
Quoted 12 lines
Quoted 2 lines
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.
Quoted 1 line
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
Signature · 3 lines
Uwe Kleine-König http://www.google.com/search?q=5+choose+3
Hi,
Quoted 4 lines · Uwe Kleine-K?nig
Quoted 1 line · Junio C Hamano
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.
I compiled it, and it works as expected. For safety, git-rerere leaves the index unmerged, so that you can verify that you wanted this resolution.
Will resubmit with a test case.
Ciao,
Dscho
PATCH 1/1 rerere: record resolution even if file is not in merge base
In reply to Junio C HamanoTwo-file merges were rare enough that they were dropped outside of the radar. This fix is a trivial change to builtin-rerere.c::find_conflict(). It is still sane to insist that we do not do rerere for symlinks, and require to have stages #2 and #3, but we can drop the requirement to have stage #1. rerere does not use information from there anyway.
This fix is from Junio, together with two tests to verify that it works as expected.
Noticed by Uwe Kleine-König.
---
Heh, this time I steal your patch and take all the credit ;-)
builtin-rerere.c | 17 +++++++---------- t/t4200-rerere.sh | 44 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 46 insertions(+), 15 deletions(-)
builtin-rerere.c +7 -10
@@ -168,19 +168,16 @@ static int find_conflict(struct path_list *conflict)int i;if (read_cache () <0 )return error ("Could not read index" ); -for (i =0 ; i +2 < active_nr; i++) { -struct cache_entry *e1 = active_cache[i]; -struct cache_entry *e2 = active_cache[i+1 ]; -struct cache_entry *e3 = active_cache[i+2 ]; -if (ce_stage (e1) ==1 && -ce_stage (e2) ==2 && +for (i =0 ; i+1 < active_nr; i++) { +struct cache_entry *e2 = active_cache[i]; +struct cache_entry *e3 = active_cache[i+1 ]; +if (ce_stage (e2) ==2 &&ce_stage (e3) ==3 && -ce_same_name (e1, e2) &&ce_same_name (e1, e3) && -S_ISREG (ntohl (e1->ce_mode)) && +ce_same_name (e2, e3) &&S_ISREG (ntohl (e2->ce_mode)) &&S_ISREG (ntohl (e3->ce_mode))) { -path_list_insert ((const char *)e1->name, conflict); - i +=2 ; +path_list_insert ((const char *)e2->name, conflict); + i++;/* skip over both #2 and #3 */ } }return 0 ;
t/t4200-rerere.sh +39 -5
54 lines not on this page · raw message
Signature · 1 line
1.5.3.rc0.2769.gd9be2
Re: [PATCH] rerere: record resolution even if file is not in merge base
Hello Johannes, hello Junio,
Quoted 10 lines · Johannes Schindelin
Two-file merges were rare enough that they were dropped outside of the radar. This fix is a trivial change to builtin-rerere.c::find_conflict(). It is still sane to insist that we do not do rerere for symlinks, and require to have stages #2 and #3, but we can drop the requirement to have stage #1. rerere does not use information from there anyway.
This fix is from Junio, together with two tests to verify that it works as expected.
Noticed by Uwe Kleine-König.
when I tested Junio's patch and wrote that it doesn't work, I was wrong. I just recompiled git-rerere and called that instead of the installed version. The problem there was, that merge didn't called the updated.
So:
Signature · 3 lines
Uwe Kleine-König http://www.google.com/search?q=1+hertz+in+sec**-1