From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Tue, 26 Jan 2010 21:10:40 +0200 Message-ID: <831vhc65sf.fsf@gnu.org> References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> <87ljfleita.fsf@uwakimon.sk.tsukuba.ac.jp> <83d40w69hv.fsf@gnu.org> <87bpgg672s.fsf@red-bean.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1264533061 20416 80.91.229.12 (26 Jan 2010 19:11:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 19:11:01 +0000 (UTC) Cc: lennart.borgman@gmail.com, rms@gnu.org, emacs-devel@gnu.org To: Karl Fogel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 20:10:53 2010 Return-path: 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.50) id 1NZqoM-0001E8-Mn for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 20:10:50 +0100 Original-Received: from localhost ([127.0.0.1]:58943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZqoN-0005xe-N5 for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 14:10:51 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZqoI-0005wc-IV for emacs-devel@gnu.org; Tue, 26 Jan 2010 14:10:46 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZqoD-0005r9-Jp for emacs-devel@gnu.org; Tue, 26 Jan 2010 14:10:45 -0500 Original-Received: from [199.232.76.173] (port=43691 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZqoD-0005r4-G3 for emacs-devel@gnu.org; Tue, 26 Jan 2010 14:10:41 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:50753) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZqoB-0007b8-CJ; Tue, 26 Jan 2010 14:10:39 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0KWV00C00BVAB700@a-mtaout22.012.net.il>; Tue, 26 Jan 2010 21:10:38 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.180.161]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWV00962BXO6AD0@a-mtaout22.012.net.il>; Tue, 26 Jan 2010 21:10:37 +0200 (IST) In-reply-to: <87bpgg672s.fsf@red-bean.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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:120462 Archived-At: > From: Karl Fogel > Cc: Eli Zaretskii , rms@gnu.org, emacs-devel@gnu.org > Date: Tue, 26 Jan 2010 13:42:51 -0500 > > Lennart Borgman writes: > >This thread is over my head, I do not have time to capture the > >details. Could the conclusions from the discussion (when it is > >somewhat ready) please be put on the EmacsWiki page? > > It's too long for me too. > > But since some people may be expecting me to maintain BzrForEmacsDevs, > this is an explicit request for someone who understands what the heck > has been concluded here to please update the page if necessary! There's nothing to update. Everything is already there. The problem which started this was because the guilty parties didn't follow the workflow described on the wiki to the letter.