Martin Langhoff wrote:
Probably should be hacked into cg-merge. When the merge reports a file
is missing, what happens? Does it leave a .rej file or anything?
The error message is:
MERGE ERROR: nfsmount/mount.c: Not handling case
3225ecdf8d172cda2a6ea5276af0d3edc566a0e7 -> ->
c02da9e576a5
On Sat, Sep 03, 2005 at 12:32:03PM -0700, Junio C Hamano wrote:
> Sam Ravnborg <[EMAIL PROTECTED]> writes:
>
> > As explained in another mail what we want to do is actually to
> > transpose the changes made to F to the now renamed file G.
> > So we end up with G containing the modifications made t
Sam Ravnborg <[EMAIL PROTECTED]> writes:
> As explained in another mail what we want to do is actually to
> transpose the changes made to F to the now renamed file G.
> So we end up with G containing the modifications made to F.
>
> Also we want to include the new file K.
Thanks for the clarifica
On Sat, Sep 03, 2005 at 11:46:53AM -0700, Junio C Hamano wrote:
[lots of good stuff]
I obviously misunderstood the complexity of this merge case. Thank you
for the explanation.
- Fredrik
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED
On Sat, Sep 03, 2005 at 11:46:53AM -0700, Junio C Hamano wrote:
> This is a simplified scenario of klibc vs klibc-kbuild HPA had
> trouble with, to help us think of a way to solve this
> interesting merge problem.
>
>#1 - #3 - #5 - #7
>// /
> #0 - #2 - #4 - #6
>
>
On Sat, Sep 03, 2005 at 01:25:50AM -0700, Junio C Hamano wrote:
> Junio C Hamano <[EMAIL PROTECTED]> writes:
>
> > "H. Peter Anvin" <[EMAIL PROTECTED]> writes:
> >
> >> I currently have two klibc trees,
> >
> > I cloned them to take a look. You_do_ seem to have a lot of
> > renames.
>
> Well, I
Fredrik Kuivinen <[EMAIL PROTECTED]> writes:
> Maybe I am missing something... but why should the merge operation
> ignore renames? Is there a merge case when ignoring renames is the
> Right Thing to do?
>
> Lets say the branches A and B has the common ancestor C which contains
> a file named "foo
This is a simplified scenario of klibc vs klibc-kbuild HPA had
trouble with, to help us think of a way to solve this
interesting merge problem.
#1 - #3 - #5 - #7
// /
#0 - #2 - #4 - #6
There are two lines of developments. #0->#2 renames F to G and
introduces K. #
On Sat, Sep 03, 2005 at 01:25:50AM -0700, Junio C Hamano wrote:
> Junio C Hamano <[EMAIL PROTECTED]> writes:
>
> > "H. Peter Anvin" <[EMAIL PROTECTED]> writes:
> >
> >> I currently have two klibc trees,
> >
> > I cloned them to take a look. You_do_ seem to have a lot of
> > renames.
>
> Well, I
Daniel Barkalow <[EMAIL PROTECTED]> writes:
> Agreed, except that git-convert-cache and git-fsck-cache actually have
> nothing to do this the index by any name, and should probably be
> git-convert-objects and git-fsck-objects.
You are right.
> I think "fetch" is more applicable to what they d
Junio C Hamano <[EMAIL PROTECTED]> writes:
> "H. Peter Anvin" <[EMAIL PROTECTED]> writes:
>
>> I currently have two klibc trees,
>
> I cloned them to take a look. You_do_ seem to have a lot of
> renames.
Well, I think I understand how your trees ancestry looks like,
but still haven't come up wit
On Sat, 2005-09-03 at 00:31 -0700, Junio C Hamano wrote:
> Which ended with the error message "Somebody should define
> smarter http server protocol". That's from git-clone-script and
> the echo to generate the output is followed by "exit 1".
Oh, I just didn't realize that was an error message. P
Pekka Enberg <[EMAIL PROTECTED]> writes:
> I double checked that -- no, it does not print out an error. I copied
> the exact output in the original mail.
Which ended with the error message "Somebody should define
smarter http server protocol". That's from git-clone-script and
the echo to genera
13 matches
Mail list logo
