From: David Bremner <david@tethera.net>
Date: Sun, 10 Feb 2013 01:26:13 +0000 (+2000)
Subject: Re: [PATCH] nmbug: only push master branch on nmbug push
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=41afeb1923b2a65beae01c4be8a3ee282c867ad8;p=notmuch-archives.git

Re: [PATCH] nmbug: only push master branch on nmbug push
---

diff --git a/d6/1a15f2f368fd61816281e9922d1bda0d0beec4 b/d6/1a15f2f368fd61816281e9922d1bda0d0beec4
new file mode 100644
index 000000000..3c7ec2d62
--- /dev/null
+++ b/d6/1a15f2f368fd61816281e9922d1bda0d0beec4
@@ -0,0 +1,66 @@
+Return-Path: <bremner@unb.ca>
+X-Original-To: notmuch@notmuchmail.org
+Delivered-To: notmuch@notmuchmail.org
+Received: from localhost (localhost [127.0.0.1])
+	by olra.theworths.org (Postfix) with ESMTP id 6DD80431FC2
+	for <notmuch@notmuchmail.org>; Mon, 11 Feb 2013 10:24:28 -0800 (PST)
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
+X-Spam-Flag: NO
+X-Spam-Score: 0
+X-Spam-Level: 
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
+	autolearn=disabled
+Received: from olra.theworths.org ([127.0.0.1])
+	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
+	with ESMTP id lkiVr1FtRpJ2 for <notmuch@notmuchmail.org>;
+	Mon, 11 Feb 2013 10:24:27 -0800 (PST)
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
+	(using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
+	(No client certificate requested)
+	by olra.theworths.org (Postfix) with ESMTPS id 6BD07431FAE
+	for <notmuch@notmuchmail.org>; Mon, 11 Feb 2013 10:24:27 -0800 (PST)
+Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net
+	([156.34.82.78] helo=zancas.localnet)
+	by tesseract.cs.unb.ca with esmtpsa
+	(TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80)
+	(envelope-from <bremner@unb.ca>)
+	id 1U4LgR-0007C7-C9; Sat, 09 Feb 2013 21:26:19 -0400
+Received: from bremner by zancas.localnet with local (Exim 4.80)
+	(envelope-from <bremner@unb.ca>)
+	id 1U4LgL-0005GD-O1; Sat, 09 Feb 2013 21:26:13 -0400
+From: David Bremner <david@tethera.net>
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org
+Subject: Re: [PATCH] nmbug: only push master branch on nmbug push
+In-Reply-To: <1360450140-8439-1-git-send-email-jani@nikula.org>
+References: <1360450140-8439-1-git-send-email-jani@nikula.org>
+User-Agent: Notmuch/0.15.1 (http://notmuchmail.org) Emacs/24.2.1
+	(x86_64-pc-linux-gnu)
+Date: Sat, 09 Feb 2013 21:26:13 -0400
+Message-ID: <8762219cy2.fsf@zancas.localnet>
+MIME-Version: 1.0
+Content-Type: text/plain
+X-Spam_bar: -
+Cc: Tomi Ollila <tomi.ollila@iki.fi>
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Mon, 11 Feb 2013 18:24:28 -0000
+
+Jani Nikula <jani@nikula.org> writes:
+
+> nmbug pull only merges upstream master, but nmbug push tries to push
+> all local branches. The asymmetry results in conflicts whenever there
+> have been changes in the config branch in the origin:
+
+LGTM
+
+d