From: Johannes Sixt <j.sixt@viscovery.net>
To: Marius Storm-Olsen <marius@trolltech.com>
Cc: git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] Add testcase for merging in a CRLF repo, showing that conflict file is in LF only
Date: Mon, 09 Jun 2008 15:37:41 +0200 [thread overview]
Message-ID: <484D3225.3020900@viscovery.net> (raw)
In-Reply-To: <26299.4828321554$1213013668@news.gmane.org>
Marius Storm-Olsen schrieb:
> An LF only conflict file results in the resolved file being in LF,
> the commit is in LF and a warning saying that LF will be replaced
> by CRLF, and the working dir ends up with a mix of CRLF and LF files.
After reading these 3 lines I've no idea what you are talking about. Can
you translate this to English, please? ;-)
> Sorry, no patch to actually *fix* the problem.
Then you should use test_expect_failure instead of test_expect_success.
And maybe also mention it in the commit message.
> +test_expect_success 'Check that conflict file is CRLF' '
> + git reset --hard a &&
> + ! git merge side &&
test_must_fail git merge side &&
> + cat file | remove_cr | append_cr >file.temp &&
> + test_cmp file file.temp
> +'
-- Hannes
next prev parent reply other threads:[~2008-06-09 13:38 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <"Storm-Olsen*"@MHS>
2008-06-09 11:40 ` [PATCH] Add testcase for merging in a CRLF repo, showing that conflict file is in LF only Marius Storm-Olsen
2008-06-09 13:37 ` Johannes Sixt [this message]
2008-06-09 14:46 ` Marius Storm-Olsen
2008-06-09 15:05 ` Johannes Sixt
2008-06-09 19:44 ` Marius Storm-Olsen
2008-06-09 21:22 ` [PATCH 1/2] Add testcase for merging in a CRLF repo Johannes Schindelin
2008-06-09 21:23 ` [PATCH 2/2] merge-recursive: respect core.autocrlf Johannes Schindelin
2008-06-09 21:36 ` Junio C Hamano
2008-06-09 22:59 ` [PATCH v2] " Johannes Schindelin
2008-06-09 23:23 ` Junio C Hamano
2008-06-09 23:35 ` Johannes Schindelin
2008-06-10 8:10 ` [PATCH 0/2] Respecting core.autocrlf when showing objects Marius Storm-Olsen
2008-06-10 7:40 ` [PATCH 1/2] Add testcases for verifying that staged files in a conflict are CRLF, when core.autocrlf = true Marius Storm-Olsen
2008-06-10 7:55 ` [PATCH 2/2] Ensure that objects shown in a core.autocrlf = true repo have CRLF EOLs Marius Storm-Olsen
2008-06-10 15:34 ` [PATCH 0/2] Respecting core.autocrlf when showing objects Johannes Schindelin
2008-06-10 22:25 ` Junio C Hamano
2008-06-11 6:01 ` Marius Storm-Olsen
2008-06-11 8:25 ` Jakub Narebski
2008-06-11 19:06 ` Johannes Schindelin
2008-06-12 9:03 ` Marius Storm-Olsen
2008-06-12 19:33 ` Junio C Hamano
2008-06-12 19:55 ` J. Bruce Fields
2008-06-12 20:27 ` Jakub Narebski
2008-06-12 20:45 ` Junio C Hamano
2008-06-12 20:50 ` Jon Loeliger
2008-06-12 20:16 ` Marius Storm-Olsen
2008-06-09 11:40 ` [PATCH] Add testcase for merging in a CRLF repo, showing that conflict file is in LF only Marius Storm-Olsen
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=484D3225.3020900@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=marius@trolltech.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).