From: Karl Hasselström <kha@treskal.com>
Date: Wed, 22 Aug 2007 09:44:13 GMT
Subject: Re: [StGit PATCH 2/6] Don't try to merge files that merge-recursive already merged
Message-ID: <20070822094413.GC30748@diana.vm.bytemark.co.uk>
In-Reply-To: <87sl6bewqo.fsf@morpheus.local>

On 2007-08-22 11:37:03 +0200, David Kågedal wrote:

> Karl Hasselström <kha@treskal.com> writes:
>
> > On 2007-08-20 10:11:59 +0200, David Kågedal wrote:
> >
> > > This avoid duplicating work, but also changes the resulting
> > > index state so that the conflicts are left in the index in the
> > > three stages.
> >
> > After this patch, t1400-patch-history fails:
>
> I think that the push(c) commits will never happen with my patches,
> so the test case needs an update.

Actually, the failure vanishes once the next patch in the series is
applied. I thought this was a good thing, but if they're never
supposed to happen, maybe the test is still broken, just not in a way
that's detected?

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle