Hi,
On Tue, 12 Feb 2008, Linus Torvalds wrote:
> On Wed, 13 Feb 2008, Johannes Schindelin wrote:
> >
> > With XDL_MERGE_ZEALOUS_ALNUM, we use the following heuristics: when a
> > hunk does not contain any letters or digits, it is treated as
> > conflicting.
>
> [...]
>
> So the "merge adjacent conflicts" logic should actually be pretty
> simple: if there is less than three lines between two conflicts, the
> conflicts should always be merged, because the end result is smaller.
>
> (And with three lines in between the end result is as many lines, but
> arguably simpler, so it's probably better to merge then too).
>
> Hmm? What do you think?
Makes sense. As I said to Junio, I'll think about an interface to do
this. The obvious choice is to have a struct, but that has to be memset()
to 0 for future compatibility.
OTOH there's xpparam_t already, and we could just have that as a member of
the new struct, something like
typedef struct s_xmergeparam {
xpparam_t xpp;
enum {
XDL_MERGE_MINIMAL = 0,
XDL_MERGE_EAGER,
XDL_MERGE_ZEALOUS,
XDL_MERGE_ZEALOUS_ALNUM
} mode;
/* minimum number of inter-conflict lines goes here */
} xmergeparam_t;
Hmm. This has to simmer in my head a bit.
Ciao,
Dscho
-
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
