From: Paolo Bonzini <bonzini@gnu.org>
To: git@vger.kernel.org
Subject: [bug] git `next' does not do trivial merges
Date: Fri, 22 Aug 2008 08:36:39 +0200 [thread overview]
Message-ID: <g8lmpn$jvk$1@ger.gmane.org> (raw)
I had already posted this bug report yesterday but it was hidden in a
cover letter at
http://permalink.gmane.org/gmane.comp.version-control.git/93143 -- so
I'll copy the relevant info here:
> The included testcases demonstrate that trivial merges are
> currently broken. The failing test is:
>
> git init
> echo a > a
> git add a
> git commit -ma
> git checkout -b branch
> echo b > b
> git add b
> git commit -mb
> git checkout master
> git merge --no-ff -s resolve branch
>
> Running this in 1.5.5 shows:
>
> Trying really trivial in-index merge...
> Wonderful.
> In-index merge
>
> while `next' gives
>
> Trying really trivial in-index merge...
> error: Untracked working tree file 'a' would be overwritten by merge.
> Nope.
> Trying simple merge.
> Merge made by resolve.
Paolo
next reply other threads:[~2008-08-22 6:38 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-22 6:36 Paolo Bonzini [this message]
2008-08-22 19:31 ` [bug] git `next' does not do trivial merges Jeff King
2008-08-23 6:08 ` Miklos Vajna
2008-08-23 8:14 ` [PATCH] Fix in-index merge Miklos Vajna
2008-08-23 8:17 ` [PATCH] builtin-merge: fail properly when we are in the middle of a conflicted merge Miklos Vajna
2008-08-23 9:01 ` Junio C Hamano
2008-08-23 10:57 ` Miklos Vajna
2008-08-23 19:55 ` Junio C Hamano
2008-08-23 19:56 ` [PATCH 1/2] merge: fix numerus bugs around "trivial merge" area Junio C Hamano
2008-08-24 1:58 ` Junio C Hamano
2008-08-28 13:43 ` [PATCH] builtin-merge: avoid run_command_v_opt() for recursive and subtree Miklos Vajna
2008-08-23 19:57 ` [PATCH 2/2] unpack_trees(): protect the handcrafted in-core index from read_cache() Junio C Hamano
2008-08-23 9:50 ` [PATCH] builtin-merge: fail properly when we are in the middle of a conflicted merge Junio C Hamano
2008-08-23 8:50 ` [PATCH] Fix in-index merge Junio C Hamano
2008-08-23 10:41 ` Miklos Vajna
2008-08-23 9:19 ` Paolo Bonzini
2008-08-23 9:55 ` Junio C Hamano
2008-08-23 10:00 ` Junio C Hamano
2008-08-23 10:41 ` [RFH] two and half potential fixlets to the in-core index handling Junio C Hamano
2008-08-23 18:13 ` Linus Torvalds
2008-08-23 19:14 ` Junio C Hamano
2008-08-23 19:21 ` Junio C Hamano
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='g8lmpn$jvk$1@ger.gmane.org' \
--to=bonzini@gnu.org \
--cc=git@vger.kernel.org \
/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).