From: Eric Raible <raible@nextest.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Poor status output during conflicted merge
Date: Thu, 1 Jul 2010 18:51:37 -0700 [thread overview]
Message-ID: <4C2D4629.1090600@nextest.com> (raw)
In-Reply-To: <7v1vbm3g8j.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
>
> It might be just a simple matter of ...
>
I don't think it's that simple. Consider the case of an integrator who
initially picks the wrong branch. Wouldn't it seem that:
git checkout --ours file
git add file
git status
should result in the same output as:
git checkout --theirs file
git add file
git status
# oops
git checkout --ours file
git add file
git status
I can accept an answer is "no". After all, 'git add' says
that you are happy. But it makes me wonder whether the empty
"if (s->in_merge)" clause in wt_status_print_cached_header()
wouldn't be the right place to handle this case.
Aside from that, wouldn't the message "merge result will be the
same as HEAD commit" be incorrect if that there are other files
which were already merged successfully?
next prev parent reply other threads:[~2010-07-02 1:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-01 18:16 Poor status output during conflicted merge Eric Raible
2010-07-02 0:00 ` Junio C Hamano
2010-07-02 1:51 ` Eric Raible [this message]
2010-07-07 0:12 ` Eric Raible
2010-07-07 5:07 ` Elijah Newren
2010-07-07 12:43 ` demerphq
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C2D4629.1090600@nextest.com \
--to=raible@nextest.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).