Re: [PATCH] A new merge stragety 'subtree'.

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH] A new merge stragety 'subtree'.

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:55

"Shawn O. Pearce" [off-list ref] writes:
Really that isn't too different from a rename detection.
I know, but I am just lazy.  The match scoring part is very well
isolated so you or anybody can plug different code there.

Re: [PATCH] A new merge stragety 'subtree'.

From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:42:55

Junio C Hamano [off-list ref] wrote:
"Shawn O. Pearce" [off-list ref] writes:
quoted
Really that isn't too different from a rename detection.
I know, but I am just lazy.  The match scoring part is very well
isolated so you or anybody can plug different code there.
Is that a hint that I should code something if I think its better?  ;-)

I'll probably try to code up a competing version of the match code
based on the fun stuff you did not quote, but likely won't get
around to it for at least week.

-- 
Shawn.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help