Re: Problem with merge when renaming

From: Alex Riesen <raa.lkml@gmail.com>
Date: Sep 19, 2007, 21:11 UTC
Message-ID: <20070919211110.GA12807@steel.home>
In-Reply-To: <7vejgvtv0a.fsf@gitster.siamese.dyndns.org>

Junio C Hamano, Wed, Sep 19, 2007 01:27:01 +0200:

Show 21 quoted lines

> > it happens with very recent git (as of today)
> >
> >>  (2) if you do "git merge -s resolve" instead of just "git
> >>      merge", do you see a difference?
> >
> > yes: it has more error output.
> >
> > Trying really trivial in-index merge...
> > warning: Merge requires file-level merging
> > Nope, a really trivial in-index merge not possible
> > Trying simple merge.
> > Simple merge failed, trying Automatic merge.
> > error: init: is a directory - add individual files instead
> > fatal: Unable to process path init
> > fatal: merge program failed
> > Automatic merge failed; fix conflicts and then commit the result.
> 
> Isn't this the same as the known issue here?
> 
> 	<http://permalink.gmane.org/gmane.comp.version-control.git/53402>
>

Yes, looks similar:

    .../git/t$ ./t3031-df-3way.sh -d -v -i
    ...
    Created commit 992a330: side moves and makes changes
     6 files changed, 155 insertions(+), 153 deletions(-)
     create mode 100644 D
     create mode 100644 D.A
     delete mode 100644 D/A
     delete mode 100644 D/B
     delete mode 100644 D/C
     create mode 100644 D0C
    *   ok 1: setup

    * expecting success:

	    git read-tree -m initial side master

    fatal: Entry 'D/A' would be overwritten by merge. Cannot merge.
    * FAIL 2: threeway

		    git read-tree -m initial side master

    .../git/t$