From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54873)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1bzNSK-0000tH-GV
	for qemu-devel@nongnu.org; Wed, 26 Oct 2016 08:37:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1bzNSH-0001IS-Es
	for qemu-devel@nongnu.org; Wed, 26 Oct 2016 08:37:20 -0400
Received: from mx1.redhat.com ([209.132.183.28]:52504)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <kraxel@redhat.com>) id 1bzNSH-0001IL-9H
	for qemu-devel@nongnu.org; Wed, 26 Oct 2016 08:37:17 -0400
Message-ID: <1477485434.18984.49.camel@redhat.com>
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 26 Oct 2016 14:37:14 +0200
In-Reply-To: <20161023195433.20102-2-samuel.thibault@ens-lyon.org>
References: <20161023195433.20102-1-samuel.thibault@ens-lyon.org>
	<20161023195433.20102-2-samuel.thibault@ens-lyon.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Mime-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH 1/3] Add dots keypresses support to the
 baum braille device
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: qemu-devel@nongnu.org

On So, 2016-10-23 at 21:54 +0200, Samuel Thibault wrote:
> Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

Hmm, this one throws strange errors at me:

kraxel@nilsson ~/projects/qemu (queue/ui)# git am -3
~/Downloads/patches/input/\[PATCH_1_3
\]_Add_dots_keypresses_support_to_the_baum_braille_device.mbox
Applying: Add dots keypresses support to the baum braille device
Using index info to reconstruct a base tree...
M       backends/baum.c
error: patch failed: backends/baum.c:1
error: backends/baum.c: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^=20
    Hmm?  How can that happen?
    /me looks puzzled.

Cannot fall back to three-way merge.
Patch failed at 0001 Add dots keypresses support to the baum braille
device

cheers,
  Gerd