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:22:37 +0100 Message-ID: <87636q2x2q.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: quoted-printable X-Trace: ger.gmane.org 1264424670 6561 80.91.229.12 (25 Jan 2010 13:04:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 13:04:30 +0000 (UTC) Cc: emacs-devel@gnu.org To: Teemu Likonen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 13:24:16 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 1NZNzK-0004Zw-Ke for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 13:24:14 +0100 Original-Received: from localhost ([127.0.0.1]:56856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZNzL-00083p-Kk for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 07:24:15 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZNzH-00082y-6w for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:24:11 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZNzB-00082m-NB for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:24:09 -0500 Original-Received: from [199.232.76.173] (port=43315 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZNzB-00082j-Ho for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:24:05 -0500 Original-Received: from impaqm1.telefonica.net ([213.4.138.1]:32503) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZNzB-0003TU-AM for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:24:05 -0500 Original-Received: from IMPmailhost3.adm.correo ([10.20.102.124]) by IMPaqm1.telefonica.net with bizsmtp id Zo9i1d00N2h2L9m01oNe92; Mon, 25 Jan 2010 13:22:38 +0100 Original-Received: from qcore ([88.24.231.92]) by IMPmailhost3.adm.correo with BIZ IMP id ZoNd1d00K20Fy201joNeX4; Mon, 25 Jan 2010 13:22:38 +0100 X-TE-authinfo: authemail="981711563$telefonica.net" |auth_email="981711563@telefonica.net" X-TE-AcuTerraCos: auth_cuTerraCos="cosuitnetc01" In-Reply-To: <87ockiflg2.fsf@mithlond.arda> (Teemu Likonen's message of "Mon, 25 Jan 2010 13:55:25 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.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." 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:120362 Teemu Likonen writes: > On 2010-01-25 12:27 (+0100), =C3=93scar 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' 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.