From: Alex Riesen <raa.lkml@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: David Euresti <evelio@gmail.com>, git@vger.kernel.org
Subject: Re: Problem with merge when renaming
Date: Wed, 19 Sep 2007 23:11:11 +0200 [thread overview]
Message-ID: <20070919211110.GA12807@steel.home> (raw)
In-Reply-To: <7vejgvtv0a.fsf@gitster.siamese.dyndns.org>
Junio C Hamano, Wed, Sep 19, 2007 01:27:01 +0200:
> > 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$
prev parent reply other threads:[~2007-09-19 21:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-18 20:34 Problem with merge when renaming David Euresti
2007-09-18 22:12 ` [PATCH] Extend t6020 with another test for d/f interactions Alex Riesen
2007-09-18 22:28 ` Problem with merge when renaming Junio C Hamano
2007-09-18 22:42 ` David Euresti
2007-09-18 22:44 ` Alex Riesen
2007-09-18 23:27 ` Junio C Hamano
2007-09-19 21:11 ` Alex Riesen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070919211110.GA12807@steel.home \
--to=raa.lkml@gmail.com \
--cc=evelio@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).