On Fri, 9 Sep 2005, Junio C Hamano wrote:
> Daniel Barkalow <[EMAIL PROTECTED]> writes:
>
> > In case #16, I'm not sure what I should produce. I think the best thing
> > might be to not leave anything in stage 1. The desired end effect is that
> > the user is given a file with a section like:
>
Daniel Barkalow <[EMAIL PROTECTED]> writes:
> In case #16, I'm not sure what I should produce. I think the best thing
> might be to not leave anything in stage 1. The desired end effect is that
> the user is given a file with a section like:
>
> {
> *t = NULL;
> *m = 0;
>
>
On Thu, 8 Sep 2005, Junio C Hamano wrote:
> Daniel Barkalow <[EMAIL PROTECTED]> writes:
>
> > I assume that what you want is something to include everything from two
> > commits, which would give conflicts if a name is reused?
>
> My understanding is that Darrin wants to do what Linus did when
Daniel Barkalow <[EMAIL PROTECTED]> writes:
> I assume that what you want is something to include everything from two
> commits, which would give conflicts if a name is reused?
My understanding is that Darrin wants to do what Linus did when
he merged gitk into git.git.
Personally I think that i
On Thu, 2005-09-08 at 17:39 -0400, Daniel Barkalow wrote:
> I assume that what you want is something to include everything from two
> commits, which would give conflicts if a name is reused?
>
Yes.
--
Darrin
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a mes
On Thu, 8 Sep 2005, Darrin Thompson wrote:
> On Mon, 2005-09-05 at 01:41 -0400, Daniel Barkalow wrote:
> > I've got a version of read-tree which accepts multiple ancestors and does
> > a merge using information from all of them.
>
> Do the multiple ancestors have to share a common parent? More t
On Thu, Sep 08, 2005 at 12:16:05PM -0500, Darrin Thompson wrote:
> On Mon, 2005-09-05 at 01:41 -0400, Daniel Barkalow wrote:
> > I've got a version of read-tree which accepts multiple ancestors and does
> > a merge using information from all of them.
>
> Do the multiple ancestors have to share a
On Mon, 2005-09-05 at 01:41 -0400, Daniel Barkalow wrote:
> I've got a version of read-tree which accepts multiple ancestors and does
> a merge using information from all of them.
Do the multiple ancestors have to share a common parent? More to the
point, is this read-tree any more friendly to ba
On Tue, 6 Sep 2005, Junio C Hamano wrote:
> Daniel Barkalow <[EMAIL PROTECTED]> writes:
>
> > Good. (Although that patch doesn't seem to be directly on top of my
> > version; I can tell what it's doing anyway)
>
> That one was against the proposed updates head. I've updated it
> again to inclu
Daniel Barkalow <[EMAIL PROTECTED]> writes:
> Good. (Although that patch doesn't seem to be directly on top of my
> version; I can tell what it's doing anyway)
That one was against the proposed updates head. I've updated it
again to include the patch.
> I'm happy with the content in "pu"; the
On Tue, 6 Sep 2005, Junio C Hamano wrote:
> Daniel Barkalow <[EMAIL PROTECTED]> writes:
>
> > Do you know if there's anything like case #16 in there? I'd be interested
> > to know if there's anything that gets handled automatically in different
> > ways depending on which single base is used, a
Daniel Barkalow <[EMAIL PROTECTED]> writes:
> Do you know if there's anything like case #16 in there? I'd be interested
> to know if there's anything that gets handled automatically in different
> ways depending on which single base is used, and doesn't require manual
> intervention with multip
On Mon, 5 Sep 2005, Junio C Hamano wrote:
> Daniel Barkalow <[EMAIL PROTECTED]> writes:
>
> > I've got a version of read-tree which accepts multiple ancestors and does
> > a merge using information from all of them.
>
> After disabling the debugging printf(), I used this read-tree to
> try reso
Daniel Barkalow <[EMAIL PROTECTED]> writes:
> I've got a version of read-tree which accepts multiple ancestors and does
> a merge using information from all of them.
After disabling the debugging printf(), I used this read-tree to
try resolving the parents of four commits Fredrik Kuivinen gave
u
I've got a version of read-tree which accepts multiple ancestors and does
a merge using information from all of them.
The basic features are that it looks for an ancestor which would permit a
trivial merge, and uses that. However, if it finds ancestors which permit
different trivial merges, it
15 matches
Mail list logo
