From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lennart Borgman Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Tue, 26 Jan 2010 19:20:22 +0100 Message-ID: References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> <87ljfleita.fsf@uwakimon.sk.tsukuba.ac.jp> <83d40w69hv.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1264530094 9313 80.91.229.12 (26 Jan 2010 18:21:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 18:21:34 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 19:21:27 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 1NZq2V-0003tI-D7 for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 19:21:27 +0100 Original-Received: from localhost ([127.0.0.1]:40508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZq2Q-0001dL-QD for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 13:21:18 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZq22-0001Ce-KD for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:20:54 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZq1x-00015F-LA for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:20:53 -0500 Original-Received: from [199.232.76.173] (port=39400 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZq1x-00014u-47 for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:20:49 -0500 Original-Received: from mail-bw0-f215.google.com ([209.85.218.215]:36150) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZq1s-0001XC-2l; Tue, 26 Jan 2010 13:20:44 -0500 Original-Received: by bwz7 with SMTP id 7so1690733bwz.26 for ; Tue, 26 Jan 2010 10:20:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=1I0c6rfVADSx0PjMu0LR7TjODLievWANC8Vw3bl5mGU=; b=WzpwNWvD6j+Dd3mci0P8XrA6mGQ+vfGXVaR7mmMHJjyY3PjENx7ByEHa7z81cFHyc2 uqwnhBdNln8H5WvD+/2vitnlZFgOSp/zlaUDxkY4SAd01A2oOLzjOtXtyq1EQwWu3mG/ vJrNyLyj5loyQ6ACddheGNkkhp7KvY1MvUvx0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=tIzgFwAZwZlgfb+cgnbgyKZ38qnFDJX0YTIxZz7W+kie8C3AEhVnuLMkRE9kh6iQZ6 RA1TlzOqXjD+RutVs0kQ4ZfA/f1lH7tAlWca45vXAV9hy3AZE9luXi15vG3ZuPNxZgyp Nvx2xCTsaWoRI9JCGhVEqYGN0t2rx+YExkB0s= Original-Received: by 10.239.185.78 with SMTP id b14mr926394hbh.89.1264530042138; Tue, 26 Jan 2010 10:20:42 -0800 (PST) In-Reply-To: <83d40w69hv.fsf@gnu.org> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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:120458 Archived-At: On Tue, Jan 26, 2010 at 6:50 PM, Eli Zaretskii wrote: >> From: Richard Stallman >> Date: Tue, 26 Jan 2010 11:49:46 -0500 >> Cc: ofv@wanadoo.es, emacs-devel@gnu.org >> >> =C2=A0 =C2=A0 Distinguishing between trunk->branch merges that are usefu= l and those >> =C2=A0 =C2=A0 that merely create unreadable history (as displayed by bzr= ) requires >> =C2=A0 =C2=A0 fine judgment. >> >> Should only the maintainers, Stefan and Yidong, be able to do >> trunk->branch merges? > > No! =C2=A0Every developer who works on a feature in a separate branch nee= ds > to do that from time to time, to avoid diverging too much from > mainline. > > The no-no (AFAIU) is to push directly from such a feature branch to > the savannah repository. 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?