This teaches rerere to grok conflicts expressed in "diff3 -m" style
output, where the version from the common ancestor is output after the
first side, preceded by a "|||||||" line.
The rerere database needs to keep only the versions from two sides, so the
code parses the original copy and discards it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
char buf[1024];
int hunk_no = 0;
enum {
char buf[1024];
int hunk_no = 0;
enum {
- RR_CONTEXT = 0, RR_SIDE_1, RR_SIDE_2,
+ RR_CONTEXT = 0, RR_SIDE_1, RR_SIDE_2, RR_ORIGINAL,
} hunk = RR_CONTEXT;
struct strbuf one, two;
FILE *f = fopen(path, "r");
} hunk = RR_CONTEXT;
struct strbuf one, two;
FILE *f = fopen(path, "r");
if (hunk != RR_CONTEXT)
goto bad;
hunk = RR_SIDE_1;
if (hunk != RR_CONTEXT)
goto bad;
hunk = RR_SIDE_1;
- } else if (!prefixcmp(buf, "=======") && isspace(buf[7])) {
+ } else if (!prefixcmp(buf, "|||||||") && isspace(buf[7])) {
if (hunk != RR_SIDE_1)
goto bad;
if (hunk != RR_SIDE_1)
goto bad;
+ hunk = RR_ORIGINAL;
+ } else if (!prefixcmp(buf, "=======") && isspace(buf[7])) {
+ if (hunk != RR_SIDE_1 && hunk != RR_ORIGINAL)
+ goto bad;
hunk = RR_SIDE_2;
} else if (!prefixcmp(buf, ">>>>>>> ")) {
if (hunk != RR_SIDE_2)
hunk = RR_SIDE_2;
} else if (!prefixcmp(buf, ">>>>>>> ")) {
if (hunk != RR_SIDE_2)
strbuf_reset(&two);
} else if (hunk == RR_SIDE_1)
strbuf_addstr(&one, buf);
strbuf_reset(&two);
} else if (hunk == RR_SIDE_1)
strbuf_addstr(&one, buf);
+ else if (hunk == RR_ORIGINAL)
+ ; /* discard */
else if (hunk == RR_SIDE_2)
strbuf_addstr(&two, buf);
else if (out)
else if (hunk == RR_SIDE_2)
strbuf_addstr(&two, buf);
else if (out)