Re: [RFH] Merge driver

2005-09-09 Thread Daniel Barkalow
On Fri, 9 Sep 2005, Junio C Hamano wrote: > Daniel Barkalow <[EMAIL PROTECTED]> writes: > > > It tries to make sure that there is room to put stuff for resolving a > > conflict without messing with modified files in the directory. > > I agree it can be used that way, but nobody seems to use it

Re: [RFH] Merge driver

2005-09-09 Thread Junio C Hamano
Daniel Barkalow <[EMAIL PROTECTED]> writes: > I'd actually been thinking it would just go into the the "resolve" driver, > with that going back to before it chose among merge-base outputs and just > sending the whole list to read-tree. > > This is no good: the current 'resolve' can generate wron

Re: [RFH] Merge driver

2005-09-09 Thread Daniel Barkalow
On Fri, 9 Sep 2005, Junio C Hamano wrote: > I have several requests to people who are interested in merges > and read-tree changes. > > I am pretty much set to use the recent read-tree updates Daniel > has been working on. The only reason it has not hit the > "master" branch yet, except that it

[RFH] Merge driver

2005-09-09 Thread Junio C Hamano
I have several requests to people who are interested in merges and read-tree changes. I am pretty much set to use the recent read-tree updates Daniel has been working on. The only reason it has not hit the "master" branch yet, except that it still has known leaks that have not been plugged, is be