Re: Merge-Recursive Improvements

view
thread

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

From: Linus Torvalds

Subject: Re: Merge-Recursive Improvements

Date: Tuesday, February 12, 2008 - 4:48 pm

On Tue, 12 Feb 2008, Voltage Spike wrote:
quoted text> 
> First, git is overly zealous at merging differences and two functions added
> at the same point in a file become intertwined during the merge. A trivial
> example of this behavior:

Hmm. Have you tested what happens if you use XDL_MERGE_EAGER instead of 
XDL_MERGE_ZEALOUS in the "level" argument to xdl_merge() in 
merge-recursive.c?

(No, I didn't test it myself, but it may get you the behaviour you want, 
and we could make it a config option for people who want a less aggressive 
merge)

			Linus
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

Merge-Recursive Improvements, Voltage Spike, (Tue Feb 12, 3:16 pm)

Re: Merge-Recursive Improvements, Junio C Hamano, (Tue Feb 12, 4:11 pm)

Re: Merge-Recursive Improvements, Linus Torvalds, (Tue Feb 12, 4:48 pm)

Re: Merge-Recursive Improvements, Johannes Schindelin, (Tue Feb 12, 5:05 pm)

[PATCH] xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM, Johannes Schindelin, (Tue Feb 12, 6:10 pm)

Re: [PATCH] xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM, Junio C Hamano, (Tue Feb 12, 6:34 pm)

Re: [PATCH] xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM, Linus Torvalds, (Tue Feb 12, 7:06 pm)

Re: Merge-Recursive Improvements, Johannes Sixt, (Wed Feb 13, 12:39 am)

Re: Merge-Recursive Improvements, Steffen Prohaska, (Wed Feb 13, 1:17 am)

Re: Merge-Recursive Improvements, Voltage Spike, (Wed Feb 13, 1:21 am)

Re: Merge-Recursive Improvements, Johannes Sixt, (Wed Feb 13, 1:46 am)

Re: [PATCH] xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM, Johannes Schindelin, (Wed Feb 13, 4:16 am)

Re: [PATCH] xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM, Johannes Schindelin, (Wed Feb 13, 4:22 am)

Re: Merge-Recursive Improvements, Junio C Hamano, (Fri Feb 15, 12:21 pm)