From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <bremner@unb.ca>
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 2FA51431FB6
	for <notmuch@notmuchmail.org>; Thu, 14 Feb 2013 03:58:44 -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 X9SfwrQP8iH2 for <notmuch@notmuchmail.org>;
	Thu, 14 Feb 2013 03:58:40 -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 313F1431FAF
	for <notmuch@notmuchmail.org>; Thu, 14 Feb 2013 03:58:40 -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 1U5xSV-0004sG-Tk; Thu, 14 Feb 2013 07:58:36 -0400
Received: from bremner by zancas.localnet with local (Exim 4.80)
	(envelope-from <bremner@unb.ca>)
	id 1U5xSP-0006PX-OB; Thu, 14 Feb 2013 07:58:29 -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: Thu, 14 Feb 2013 07:58:29 -0400
Message-ID: <87sj4z6ra2.fsf@zancas.localnet>
MIME-Version: 1.0
Content-Type: text/plain
X-Spam_bar: -
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: Thu, 14 Feb 2013 11:58:44 -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:

pushed.

d