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 06:25:34 +0200 Message-ID: <83hbq95w75.fsf@gnu.org> References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> <87ljfleita.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1264481237 17653 80.91.229.12 (26 Jan 2010 04:47:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 04:47:17 +0000 (UTC) Cc: ofv@wanadoo.es, rms@gnu.org, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 05:47:09 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 1NZdKW-0006a3-1P for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 05:47:08 +0100 Original-Received: from localhost ([127.0.0.1]:46541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZdKX-0006io-12 for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 23:47:09 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZczk-0004vc-Hm for emacs-devel@gnu.org; Mon, 25 Jan 2010 23:25:40 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZczf-0004pP-K6 for emacs-devel@gnu.org; Mon, 25 Jan 2010 23:25:40 -0500 Original-Received: from [199.232.76.173] (port=35597 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZczf-0004p4-Dp for emacs-devel@gnu.org; Mon, 25 Jan 2010 23:25:35 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:56973) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZczd-0003fM-MU; Mon, 25 Jan 2010 23:25:33 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0KWU00L006Y56R00@a-mtaout22.012.net.il>; Tue, 26 Jan 2010 06:25:32 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.180.161]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWU00H2A6YJRHF0@a-mtaout22.012.net.il>; Tue, 26 Jan 2010 06:25:32 +0200 (IST) In-reply-to: <87ljfleita.fsf@uwakimon.sk.tsukuba.ac.jp> 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:120416 Archived-At: > From: "Stephen J. Turnbull" > Date: Tue, 26 Jan 2010 10:49:53 +0900 > Cc: =D3scar Fuentes , emacs-devel@gnu.org >=20 > Richard Stallman writes: > > If my guess is right, Mark merged trunk into his private bra= nch, and > > then pushed to upstream, which is very wrong. > >=20 > > If we think this is wrong practice, can we customize something s= o that > > it isn't allowed? >=20 > No. Merging from trunk to branch is often very useful for any of > several reasons, and merging from branch to trunk is necessary (tha= t's > how new code gets into trunk and becomes available to the community= ). > It would be a very bad idea to forbid either kind of merge. I think Richard was asking about pushing from a private branch, not about merging. At least, AFAIU, this is the part that =D3scar said w= as very wrong.