From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: martin rudalics <rudalics@gmx.at>
Newsgroups: gmane.emacs.devel
Subject: Re: some bzrmerge.el questions
Date: Mon, 17 Jan 2011 18:58:10 +0100
Message-ID: <4D348332.4050207@gmx.at>
References: <1e7he81r9l.fsf@fencepost.gnu.org>	<jwvoc7kcwvp.fsf-monnier+emacs@gnu.org>	<hcd3o0t0ud.fsf@fencepost.gnu.org>
	<24mxn3cr6e.fsf@fencepost.gnu.org>	<jwvipxr72o0.fsf-monnier+emacs@gnu.org>
	<uqtyh9vqvh.fsf@fencepost.gnu.org>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-Trace: dough.gmane.org 1295287126 21331 80.91.229.12 (17 Jan 2011 17:58:46 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Mon, 17 Jan 2011 17:58:46 +0000 (UTC)
Cc: Stefan Monnier <monnier@iro.umontreal.ca>, emacs-devel@gnu.org
To: Glenn Morris <rgm@gnu.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 17 18:58:40 2011
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([199.232.76.165])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1PetLa-0004H8-OF
	for ged-emacs-devel@m.gmane.org; Mon, 17 Jan 2011 18:58:34 +0100
Original-Received: from localhost ([127.0.0.1]:56009 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1PetLY-000899-HJ
	for ged-emacs-devel@m.gmane.org; Mon, 17 Jan 2011 12:58:28 -0500
Original-Received: from [140.186.70.92] (port=44654 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PetLT-00087P-MW
	for emacs-devel@gnu.org; Mon, 17 Jan 2011 12:58:24 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rudalics@gmx.at>) id 1PetLK-0002eL-4E
	for emacs-devel@gnu.org; Mon, 17 Jan 2011 12:58:23 -0500
Original-Received: from mailout-de.gmx.net ([213.165.64.22]:45833)
	by eggs.gnu.org with smtp (Exim 4.71)
	(envelope-from <rudalics@gmx.at>) id 1PetLJ-0002e7-N7
	for emacs-devel@gnu.org; Mon, 17 Jan 2011 12:58:14 -0500
Original-Received: (qmail invoked by alias); 17 Jan 2011 17:58:11 -0000
Original-Received: from 62-47-37-221.adsl.highway.telekom.at (EHLO [62.47.37.221])
	[62.47.37.221]
	by mail.gmx.net (mp058) with SMTP; 17 Jan 2011 18:58:11 +0100
X-Authenticated: #14592706
X-Provags-ID: V01U2FsdGVkX19lYXY87l5lXcbo4ahXxuQnhyerIN3IgelXWr5LCd
	LygmFxHGR/dK/g
User-Agent: Thunderbird 2.0.0.21 (Windows/20090302)
In-Reply-To: <uqtyh9vqvh.fsf@fencepost.gnu.org>
X-Y-GMX-Trusted: 0
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:134651
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/134651>

 > Could you add a similar thing for changes in comments that only relate
 > to loaddef checksums? I think in such cases, it should not bother
 > merging the change.

During recent bzr updates I got a number (~ 5) of conflicts wrt loaddef
checksums.  I simply ignored them via bzr revert.  Was that the right
way to deal with this problem?

martin