Linus Torvalds [EMAIL PROTECTED] writes:
Daniel,
I'm not 100% sure what you're trying to do, but one thing that might work
out is to just having multiple stage 3 entries with the same pathname.
My understanding is that he is enhancing the current three-way
merge 'read-tree -m O A B' we are
On Mon, 29 Aug 2005, Junio C Hamano wrote:
But if we allowed duplicate entries per stage, I think we could easily
just fold stage 2/3 into one stage, and just have n entries in stage 2.
That would immediately mean that a three-way merge could be n way.
I suspect you are solving a
I've gotten to the point of having all of the entries for a given path
ready to put into the cache at the same, and now I want to convert the
merge functions to take their data directly, rather than in the cache, so
that they can take extra entries for extra ancestors.
Part of threeway_merge,
Junio C Hamano [EMAIL PROTECTED] writes:
Daniel Barkalow [EMAIL PROTECTED] writes:
Part of threeway_merge, however, wants to search the rest of the cache for
interfering entries in some cases, which would have to happen differently,
because I won't have the cache completely filled out
On Sat, 27 Aug 2005, Daniel Barkalow wrote:
What I missed was that the effect of causes_df_conflict is to give no
merge for the entry, rather than giving an error overall. So I do need an
equivalent.
Daniel,
I'm not 100% sure what you're trying to do, but one thing that might work
out
On Sat, 27 Aug 2005, Linus Torvalds wrote:
On Sat, 27 Aug 2005, Daniel Barkalow wrote:
What I missed was that the effect of causes_df_conflict is to give no
merge for the entry, rather than giving an error overall. So I do need an
equivalent.
Daniel,
I'm not 100% sure what you're
Daniel Barkalow [EMAIL PROTECTED] writes:
What I missed was that the effect of causes_df_conflict is to give no
merge for the entry, rather than giving an error overall. So I do need an
equivalent.
Correct.
-
To unsubscribe from this list: send the line unsubscribe git in
the body of a
7 matches
Mail list logo
