From: Junio C Hamano <gitster@pobox.com>
To: Kevin Bracey <kevin@bracey.fi>
Cc: git@vger.kernel.org, David Aguilar <davvid@gmail.com>,
Ciaran Jessup <ciaranj@gmail.com>,
Scott Chacon <schacon@gmail.com>,
Alex Riesen <raa.lkml@gmail.com>
Subject: Re: [PATCH v3 3/3] git-merge-one-file: revise merge error reporting
Date: Wed, 13 Mar 2013 10:57:26 -0700 [thread overview]
Message-ID: <7vehfj2neh.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1363137142-18606-3-git-send-email-kevin@bracey.fi> (Kevin Bracey's message of "Wed, 13 Mar 2013 03:12:22 +0200")
Kevin Bracey <kevin@bracey.fi> writes:
> Commit 718135e improved the merge error reporting for the resolve
> strategy's merge conflict and permission conflict cases, but led to a
> malformed "ERROR: in myfile.c" message in the case of a file added
> differently.
>
> This commit reverts that change, and uses an alternative approach without
> this flaw.
>
> Signed-off-by: Kevin Bracey <kevin@bracey.fi>
> ---
> git-merge-one-file.sh | 20 +++++++-------------
> 1 file changed, 7 insertions(+), 13 deletions(-)
>
> diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
> index 0f164e5..78b07a8 100755
> --- a/git-merge-one-file.sh
> +++ b/git-merge-one-file.sh
> @@ -104,11 +104,13 @@ case "${1:-.}${2:-.}${3:-.}" in
> ;;
> esac
>
> + ret=0
> src1=$(git-unpack-file $2)
> src2=$(git-unpack-file $3)
> case "$1" in
> '')
> - echo "Added $4 in both, but differently."
> + echo "ERROR: Added $4 in both, but differently."
> + ret=1
The problem you identified may be worth fixing, but I do not think
this change is correct.
This message is at the same severity level as the message on the
other arm of this case that says "Auto-merging $4". In that other
case arm, we are attempting a true three-way merge, and in this case
arm, we are attempting a similar three-way merge using your "virtual
base".
Neither has found any error in this case arm yet. The messages are
both "informational", not an error. I do not think you would want
to set ret=1 until you see content conflict.
next prev parent reply other threads:[~2013-03-13 17:57 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-06 20:32 [PATCH 0/2] Improve P4Merge mergetool invocation Kevin Bracey
2013-03-06 20:32 ` [PATCH 1/2] p4merge: swap LOCAL and REMOTE for mergetool Kevin Bracey
2013-03-07 0:36 ` Junio C Hamano
2013-03-07 6:16 ` Kevin Bracey
2013-03-07 7:23 ` Junio C Hamano
2013-03-07 17:14 ` Kevin Bracey
2013-03-07 19:10 ` Junio C Hamano
2013-03-07 19:50 ` David Aguilar
2013-03-07 20:31 ` Junio C Hamano
2013-03-06 20:32 ` [PATCH 2/2] p4merge: create a virtual base if none available Kevin Bracey
2013-03-07 2:23 ` David Aguilar
2013-03-07 6:28 ` Kevin Bracey
2013-03-07 7:25 ` Junio C Hamano
2013-03-07 3:33 ` David Aguilar
2013-03-09 19:20 ` [PATCH v2 0/3] Improve P4Merge mergetool invocation Kevin Bracey
2013-03-09 19:20 ` [PATCH v2 1/3] mergetools/p4merge: swap LOCAL and REMOTE Kevin Bracey
2013-03-09 19:20 ` [PATCH v2 2/3] mergetools/p4merge: create a base if none available Kevin Bracey
2013-03-10 4:55 ` Junio C Hamano
2013-03-09 19:21 ` [PATCH v2 3/3] git-merge-one-file: revise merge error reporting Kevin Bracey
2013-03-13 1:12 ` [PATCH v3 1/3] mergetools/p4merge: swap LOCAL and REMOTE Kevin Bracey
2013-03-13 1:12 ` [PATCH v3 2/3] mergetools/p4merge: create a base if none available Kevin Bracey
2013-03-13 1:12 ` [PATCH v3 3/3] git-merge-one-file: revise merge error reporting Kevin Bracey
2013-03-13 9:03 ` David Aguilar
2013-03-24 12:26 ` [PATCH v2 0/3] git-merge-one-file " Kevin Bracey
2013-03-24 12:26 ` [PATCH v2 1/3] git-merge-one-file: style cleanup Kevin Bracey
2013-03-24 12:26 ` [PATCH v2 2/3] git-merge-one-file: send "ERROR:" messages to stderr Kevin Bracey
2013-03-24 12:26 ` [PATCH v2 3/3] git-merge-one-file: revise merge error reporting Kevin Bracey
2013-03-25 17:04 ` Junio C Hamano
2013-03-25 17:17 ` Junio C Hamano
2013-03-25 17:20 ` Junio C Hamano
2013-03-25 19:24 ` Eric Sunshine
2013-03-13 17:57 ` Junio C Hamano [this message]
2013-03-14 6:27 ` [PATCH v3 " Kevin Bracey
2013-03-14 14:56 ` Junio C Hamano
2013-03-14 17:31 ` Kevin Bracey
2013-03-14 17:39 ` Kevin Bracey
2013-03-13 2:05 ` [PATCH v3 1/3] mergetools/p4merge: swap LOCAL and REMOTE David Aguilar
2013-03-24 11:54 ` [PATCH v4 1/2] " Kevin Bracey
2013-03-24 11:54 ` [PATCH v4 2/2] mergetools/p4merge: create a base if none available Kevin Bracey
2013-03-25 17:47 ` 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=7vehfj2neh.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=ciaranj@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=kevin@bracey.fi \
--cc=raa.lkml@gmail.com \
--cc=schacon@gmail.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).