From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Teemu Likonen Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 15:41:54 +0200 Message-ID: <87fx5ufgil.fsf@mithlond.arda> References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> <87hbqa2zmf.fsf@telefonica.net> <87ockiflg2.fsf@mithlond.arda> <87636q2x2q.fsf@telefonica.net> 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 1264427209 16507 80.91.229.12 (25 Jan 2010 13:46:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 13:46:49 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 14:46:41 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 1NZPH6-0005Fx-FW for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 14:46:40 +0100 Original-Received: from localhost ([127.0.0.1]:44341 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZPH7-0003qB-Gf for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 08:46:41 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZPDf-0001fc-AS for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:43:07 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZPDa-0001dk-SG for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:43:06 -0500 Original-Received: from [199.232.76.173] (port=53924 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZPDa-0001db-Fi for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:43:02 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:62211) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZPDZ-00051U-NG for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:43:01 -0500 Original-Received: from mta-out.inet.fi ([195.156.147.13] helo=kirsi2.inet.fi) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZPDP-00005s-M2 for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:42:51 -0500 Original-Received: from mithlond.arda (84.251.132.215) by kirsi2.inet.fi (8.5.014) id 4B17EFA60249E360; Mon, 25 Jan 2010 15:41:54 +0200 Original-Received: from dtw by mithlond.arda with local (Exim 4.69) (envelope-from ) id 1NZPCU-00038R-4F; Mon, 25 Jan 2010 15:41:54 +0200 In-Reply-To: <87636q2x2q.fsf@telefonica.net> (=?iso-8859-1?Q?=22=D3scar?= Fuentes"'s message of "Mon, 25 Jan 2010 13:22:37 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) 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:120367 Archived-At: On 2010-01-25 13:22 (+0100), =D3scar Fuentes wrote: > 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. I made it with "git log --graph --oneline" and copy-pasted to my message. >> 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. Ok, yes. Bazaar's log gets really bad if one doesn't maintain strict mainline mentality and practices. What looks like the mainline is not always so. I don't think it was a good design decision to build user interface too heavily around that.