view mercurial/bdiff.h @ 45412:aaeccdb6e654 stable

repoview: pin revisions for `local` and `other` when a merge is active

I've hit this a couple of times, where pulling with a dirty `wdir` obsoletes
`p1` and updating to the successor results in merge conflicts.  The problem was
resolving them failed immediately, complaining that the old checkout was
filtered.

The change in `test-rebase-obsolete.t` is because there's an outstanding merge
conflict in a rebase operation.  The summary prompt to merge seems incorrect for
this scenario, but that's an existing issue.

Differential Revision: https://phab.mercurial-scm.org/D8980

#ifndef _HG_BDIFF_H_
#define _HG_BDIFF_H_

#include "compat.h"

struct bdiff_line {
	int hash, n, e;
	ssize_t len;
	const char *l;
};

struct bdiff_hunk;
struct bdiff_hunk {
	int a1, a2, b1, b2;
	struct bdiff_hunk *next;
};

int bdiff_splitlines(const char *a, ssize_t len, struct bdiff_line **lr);
int bdiff_diff(struct bdiff_line *a, int an, struct bdiff_line *b, int bn,
               struct bdiff_hunk *base);
void bdiff_freehunks(struct bdiff_hunk *l);

#endif