Re: SEGV in git-merge recursive:

["Alex Riesen" <raa.lkml@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1685 bytes --]

On 3/29/07, Alex Riesen <raa.lkml@gmail.com> wrote:
> > Here is the output from that more verbose version:
> >
> > Merging HEAD with 0134d595adb023841750f1ce84ecb94dd4e4c9cb
> > Merging:
> > 922ee6e3f1222c8e171e6ea0b6ac0f28fb1f0683 Mail.
> > 0134d595adb023841750f1ce84ecb94dd4e4c9cb Mail.
> > found 2 common ancestor(s):
> > 29e722de58df3cd82600fa5215ec26f80a8c0f9a Mail.
> > 2c3490d82610d12d8dfde36b29c4ec5a50955b89 Mail.
> >   Merging:
> >   29e722de58df3cd82600fa5215ec26f80a8c0f9a Mail.
> >   2c3490d82610d12d8dfde36b29c4ec5a50955b89 Mail.
> >   found 1 common ancestor(s):
> >   e2123cfd9a53e441c7c715627953606c6093e0e4 Merge commit 'origin'
> >   CONFLICT (rename/rename): Rename .drafts/new/1175001142.P509Q1.hermes->.mom/cur/1175098106.P18146Q0M209985.socrates:2,S in branch Temporary merge branch 1 rename .drafts/new/1175001142.P509Q1.hermes->.drafts/cur/1175001142.P509Q1.hermes:2, in Temporary merge branch 2
>
> Rename conflict... Will see, if I can reproduce it without your repo.

I failed to reproduce it. My attempt attached (that's for your
reference pleasure, Dscho).
The output was:

GIT_MERGE_VERBOSITY=99 git merge B
Merging HEAD with B
Merging:
18d0538 rename
d4badb1 rename
found 2 common ancestor(s):
962b369 change
9cc8ebd change
  Merging:
  962b369 change
  9cc8ebd change
  found 1 common ancestor(s):
  a46f64f init
CONFLICT (rename/rename): Rename 1->a in branch HEAD rename 1->b in B
Automatic merge failed; fix conflicts and then commit the result.

Tom, either the stack trace of -O0 -ggdb or your repo is badly needed.
The stack preferred, as I have that feeling it'll just work everywhere
else but your system (can you try it somewhere else, BTW?).

[-- Attachment #2: ren-conflict.tar.bz2 --]
[-- Type: application/x-bzip2, Size: 8378 bytes --]