1 Return-Path: <cworth@cworth.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 3C8B3429E20
\r
6 for <notmuch@notmuchmail.org>; Wed, 26 Jan 2011 04:39:09 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.99 tagged_above=-999 required=5
\r
12 tests=[ALL_TRUSTED=-1, T_MIME_NO_TEXT=0.01] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id eIrBJ6ptzQSU; Wed, 26 Jan 2011 04:39:08 -0800 (PST)
\r
16 Received: from yoom.home.cworth.org (localhost [127.0.0.1])
\r
17 by olra.theworths.org (Postfix) with ESMTP id 83059431FB6;
\r
18 Wed, 26 Jan 2011 04:39:08 -0800 (PST)
\r
19 Received: by yoom.home.cworth.org (Postfix, from userid 1000)
\r
20 id B00592540E0; Wed, 26 Jan 2011 22:39:07 +1000 (EST)
\r
21 From: Carl Worth <cworth@cworth.org>
\r
22 To: Michal Sojka <sojkam1@fel.cvut.cz>, notmuch@notmuchmail.org
\r
23 Subject: Re: [PATCH] test: Make it easier to resolve conflicts when adding new
\r
25 In-Reply-To: <1295781144-20308-1-git-send-email-sojkam1@fel.cvut.cz>
\r
26 References: <1295781144-20308-1-git-send-email-sojkam1@fel.cvut.cz>
\r
27 User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.2.1
\r
29 Date: Wed, 26 Jan 2011 22:39:07 +1000
\r
30 Message-ID: <87bp33261g.fsf@yoom.home.cworth.org>
\r
32 Content-Type: multipart/signed; boundary="=-=-=";
\r
33 micalg=pgp-sha1; protocol="application/pgp-signature"
\r
34 X-BeenThere: notmuch@notmuchmail.org
\r
35 X-Mailman-Version: 2.1.13
\r
37 List-Id: "Use and development of the notmuch mail system."
\r
38 <notmuch.notmuchmail.org>
\r
39 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
40 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
41 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
42 List-Post: <mailto:notmuch@notmuchmail.org>
\r
43 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
44 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
46 X-List-Received-Date: Wed, 26 Jan 2011 12:39:09 -0000
\r
49 Content-Transfer-Encoding: quoted-printable
\r
51 On Sun, 23 Jan 2011 12:12:24 +0100, Michal Sojka <sojkam1@fel.cvut.cz> wrot=
\r
53 > Currently, there are two places in the test framework that contain very
\r
54 > long list on a single line. Whenever a test is added (or changed) in
\r
55 > several branches and these branches are merged, it results in conflict
\r
56 > which is hard to resolve because one has to go through the whole long
\r
57 > line to find where the conflict is.
\r
59 > This patch splits these long lists to several lines so that the
\r
60 > conflicts are easier to resolve.
\r
62 Thanks. That will be right handy. Committed.
\r
67 carl.d.worth@intel.com
\r
70 Content-Type: application/pgp-signature
\r
72 -----BEGIN PGP SIGNATURE-----
\r
73 Version: GnuPG v1.4.10 (GNU/Linux)
\r
75 iD8DBQFNQBXr6JDdNq8qSWgRAo3VAKCS2Q8ykDl6T86hQDRXK5Hc4px2bgCeKWjF
\r
76 6AkI9+loDN/eGk0DTQlZnKY=
\r
78 -----END PGP SIGNATURE-----
\r