From: "Schalk, Ken" <ken.schalk@intel.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: RE: [PATCH] Avoid rename/add conflict when contents are identical
Date: Tue, 31 Aug 2010 14:05:51 -0700 [thread overview]
Message-ID: <EF9FEAB3A4B7D245B0801936B6EF4A2533CEF8@azsmsx503.amr.corp.intel.com> (raw)
In-Reply-To: <AANLkTik2op0_Cq13EGit17ja+zCdmbM6WXJ=rfhQMnOQ@mail.gmail.com>
>On Fri, Aug 27, 2010 at 22:14, Schalk, Ken <ken.schalk@intel.com> wrote:
>> + ln -s e a &&
>Due to this this (and maybe all the tests) need to depend on the
>SYMLINKS prereq.
I used a symlink here to try and duplicate the original problem case that a git user at Intel brought to me. I admit I didn't consider the problem of testing on platforms without symlink support.
I'm having a little difficulty generating a rename/add conflict inside this test without using a symlink, which seems odd to me as the symlink doesn't seem to be necessary in an experiment I did by hand. I'll either re-submit with this portion of the test conditional on symlink support, or with an alternate test that doesn't use symlinks (if I can get that to work in the test).
--Ken
next prev parent reply other threads:[~2010-08-31 21:06 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-09 21:00 [PATCH] Avoid rename/add conflict when contents are identical Schalk, Ken
2010-08-09 21:24 ` Ævar Arnfjörð Bjarmason
2010-08-13 1:18 ` Junio C Hamano
2010-08-27 22:14 ` Schalk, Ken
2010-08-28 10:12 ` Ævar Arnfjörð Bjarmason
2010-08-31 21:05 ` Schalk, Ken [this message]
2010-09-01 20:15 ` Schalk, Ken
2010-09-03 18:29 ` 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
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=EF9FEAB3A4B7D245B0801936B6EF4A2533CEF8@azsmsx503.amr.corp.intel.com \
--to=ken.schalk@intel.com \
--cc=avarab@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.
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).