From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 13:30:45 +0100 Message-ID: <87y6jm1i4q.fsf@telefonica.net> References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> <87hbqa2zmf.fsf@telefonica.net> <87ockiflg2.fsf@mithlond.arda> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1264424258 4412 80.91.229.12 (25 Jan 2010 12:57:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 12:57:38 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 13:31:32 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 1NZO6N-0007L5-IH for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 13:31:31 +0100 Original-Received: from localhost ([127.0.0.1]:42351 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZO6O-00046G-RX for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 07:31:32 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZO6J-00045P-C3 for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:31:27 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZO6D-00040s-4J for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:31:26 -0500 Original-Received: from [199.232.76.173] (port=36141 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZO6D-00040m-0y for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:31:21 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:33671) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZO6C-0004Pe-MI for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:31:20 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NZO68-0007Gk-V4 for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:31:16 +0100 Original-Received: from 92.red-88-24-231.staticip.rima-tde.net ([88.24.231.92]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 25 Jan 2010 13:31:16 +0100 Original-Received: from ofv by 92.red-88-24-231.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 25 Jan 2010 13:31:16 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 46 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 92.red-88-24-231.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:TNB2YWZ1RIDHp9Y29fg0Otxb+X0= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:120358 [sorry if this is a duplicate. seems gmane is going on and off today] Teemu Likonen writes: > On 2010-01-25 12:27 (+0100), Óscar Fuentes wrote: > >> OTOH, Mark looks like more >> >> somebranch $ bzr merge URL_TO_UPSTREAM_TRUNK >> somebranch $ bzr commit >> somebranch $ bzr push URL_TO_UPSTREAM_TRUNK >> >> which causes havoc. > > Let's visualize: I was going to do that. Thanks for saving me the ASCII art. I abhor doing any kind of visual art :-) You can view the branch diagram with `bzr qlog'. You need the qbzr plugin, which is included on most bzr installers and distro repositories. [snip] > Well, technically nothing bad has happened. Unless you take the "technically" part as "no code was lost", I beg to differ. A simple `bzr log --lines' will show that the commits of the last few days are gone from the listing. You need to add the `-n2' parameter to see them as merged history under Mark's commit. Ideally, you shouldn't need to look at the merged history except for "serious" branches. Do a `bzr log -n2' and see how much uninteresting stuff you get. So now part of the important stuff was moved to the same level as the uninteresting stuff. Oh, and apart from this problem and producing a huge diff, it breaks bisection. > It's a social question if it's important to always have the trunk the > first parent. As you said on a previous message, for bzr it is important to differentiate the left-most part of the history. The writers of the BzrForEmacsDevs wiki page were very careful about this point when they wrote the workflow description.