From: Pickens, James E <james.e.pickens@intel.com>
Date: Wed, 29 Jul 2009 16:39:52 GMT
Subject: RE: [PATCH 2/2] Demonstrate merge failure when a directory is replaced with a symlink.
Message-ID: <3BA20DF9B35F384F8B7395B001EC3FB3424029A4@azsmsx507.amr.corp.intel.com>
In-Reply-To: <4A70086C.9070408@drmicha.warpmail.net>

On Wed, Jul 29, 2009, Michael J Gruber<git@drmicha.warpmail.net> wrote:
> In fact they are identical: Exchange b for b-2 and vice versa everywhere
> and you get the same test, except for the fact that in 1/2 you "test -f"
> in the last step. But I'm sure that test fails at the merge step already
> (because of a dirty worktree), doesn't it? You should see this when
> running the test with -d/-v. (I'm guessing, I haven't run your test.)

<snip>

> As in 1/2, I think the first expect_failure leaves a dirty/unexpected
> worktree (d missing) which causes the merge failure in the last step.

That's true, but this test still fails even after applying Kjetil's patch
that fixes the first problem (so the work tree is clean before 'git merge'
is run).

James