From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thierry Volpiatto Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 14:52:54 +0100 Organization: ThierryVolpiatto Message-ID: <87ockifg09.fsf@tux.homenetwork> 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> <87fx5ufgil.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 1264429064 28196 80.91.229.12 (25 Jan 2010 14:17:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 14:17:44 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 15:17:34 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 1NZPjU-0002ZQ-2D for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 15:16:00 +0100 Original-Received: from localhost ([127.0.0.1]:52642 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZPjU-0002iv-PE for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 09:16:00 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZPjO-0002hN-M4 for emacs-devel@gnu.org; Mon, 25 Jan 2010 09:15:54 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZPjJ-0002ai-UQ for emacs-devel@gnu.org; Mon, 25 Jan 2010 09:15:54 -0500 Original-Received: from [199.232.76.173] (port=53236 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZPjJ-0002aJ-LS for emacs-devel@gnu.org; Mon, 25 Jan 2010 09:15:49 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:64279) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZPjJ-0005i5-EU for emacs-devel@gnu.org; Mon, 25 Jan 2010 09:15:49 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZPSC-0001Ut-Gt for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:58:08 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NZPS9-0000hd-HO for emacs-devel@gnu.org; Mon, 25 Jan 2010 14:58:05 +0100 Original-Received: from 134.77.197-77.rev.gaoland.net ([77.197.77.134]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 25 Jan 2010 14:58:05 +0100 Original-Received: from thierry.volpiatto by 134.77.197-77.rev.gaoland.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 25 Jan 2010 14:58:05 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 108 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 134.77.197-77.rev.gaoland.net Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAElBMVEUHBARgJRFPS0WbMBTC TSG/uJs0yyVHAAAACXBIWXMAAAsSAAALEgHS3X78AAAACXZwQWcAAAAwAAAAMADO7oxXAAABpUlE QVQ4y3VTQXKDMAyUnD7AwvQOhtxj5N4LFh9ow/+/UtlpM0BczWSS0Wola7UBeEb3+3kJ/5p9ZLz3 UI0n0J0Y4K/lh1nG24FhlJOR2LdSKtpV5gfi/Zd+NdaJBbB4D5N0JnfUIVp6obZURkJwS2a8b9uX AkgxA5gCEcknAH1s2z0DPooWmjGKcJR+HNZt+9bm0GtGRycRuZGs98Ffr02vABWGopIAhmXmxnQN BwBXZjgFLHRoqbfeYxCLWqsjLyKhbEHW+A5nEs699Q2O80ALrgHTmUTy6P0MnKyKQpKHpoNWokxs F0D5VegvWmEozyE6nuMiS98mWzlUQ9bW8qYfqOaFtzWlYCqGeIs6HEyl08jkrxUG9MF5ipXpOOpd ZMoXPPVSLWJiiwNNB+eRSyxJZmQKcacikgucnCRiHuJOLmyYJRDPwOqAvY4pA+Wy+VS8G26BAsdb Ph2Hw7ORy/H0IOG0TnaM8Cp0XrFYyU0v2z8AqkifPVbLZ0qo/gsRg60C7p+8Ov9jrUIxFde+jnAq X42hyp/c+ZcnVyUYBarrqZt3+R8450png3cWKgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAwOC0wNS0z MVQyMjoxNDoyMiswMjowMK3VBDcAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDctMTAtMjhUMTc6MDg6 NDgrMDE6MDDLdIcLAAAAEXRFWHRqcGVnOmNvbG9yc3BhY2UAMix1VZ8AAAAgdEVYdGpwZWc6c2Ft cGxpbmctZmFjdG9yADJ4MiwxeDEsMXgxSfqmtAAAAABJRU5ErkJggg== User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:uJdoey0I7hIb5jG5hN9YD/p8XLE= X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:120370 Archived-At: Teemu Likonen writes: > On 2010-01-25 13:22 (+0100), Óscar 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. If it can help here is the graph log made on my hg repo: thierry@/home/thierry/download/emacs-hg $ hg glog -l 12 @ changeset: 106987:e18a3ab3c2a8 | tag: tip | user: Dan Nicolaescu | date: Mon Jan 25 01:04:59 2010 -0800 | summary: (vc-annotate-revision-at-line): Compare file | o changeset: 106986:537d6b88b0c9 |\ parent: 106984:c7c26994ef04 | | parent: 106985:75b813119b24 | | user: Jan D. | | date: Mon Jan 25 08:46:15 2010 +0100 | | summary: * xfns.c (Fx_create_frame): If frame height is too big, try | | | o changeset: 106985:75b813119b24 |/| parent: 106957:ba33512ab5de | | parent: 106984:c7c26994ef04 | | user: Jan D. | | date: Mon Jan 25 08:45:12 2010 +0100 | | summary: Merge from trunk | | o | changeset: 106984:c7c26994ef04 | | user: Dan Nicolaescu | | date: Sun Jan 24 22:03:23 2010 -0800 | | summary: (vc-bzr-print-log): Use the more compact --line option | | o | changeset: 106983:25c4b65d9f7d |\ \ parent: 106982:6e531c0687e2 | | | parent: 106980:f5df3c57ab2e | | | user: Mark A. Hershberger | | | date: Mon Jan 25 00:03:35 2010 -0500 | | | summary: merge | | | | o | changeset: 106982:6e531c0687e2 | | | user: Mark A. Hershberger | | | date: Mon Jan 25 00:02:10 2010 -0500 | | | summary: working version of vc-bzr-revision-table | | | | o | changeset: 106981:dacda1d80bbd | |\ \ parent: 106958:3fda37a060cc | | | | parent: 106979:8dfa52d01f3a | | | | user: Mark A. Hershberger | | | | date: Sun Jan 24 23:52:26 2010 -0500 | | | | summary: merge conflict | | | | o---+ | changeset: 106980:f5df3c57ab2e | | | user: Eric Hanchrow / / / date: Sun Jan 24 20:46:40 2010 -0800 | | | summary: (vc-git-dir-status-goto-stage): Pass --relative to the | | | | o | changeset: 106979:8dfa52d01f3a | |\ \ parent: 106978:df60abaf45d8 | | | | parent: 106959:2217a5de9d38 | | | | user: Stefan Monnier | | | | date: Sun Jan 24 21:52:03 2010 -0500 | | | | summary: Try and fix bug#788, hopefully for real this time. | | | | | | o | changeset: 106978:df60abaf45d8 | | | | user: Chong Yidong | | | | date: Sun Jan 24 18:03:13 2010 -0500 | | | | summary: Use png_sig_cmp to allow linking with libpng 1.4.0. | | | | | | o | changeset: 106977:172a011a9563 | | | | user: Dan Nicolaescu | | | | date: Sun Jan 24 13:23:17 2010 -0800 | | | | summary: Remove support for adding --signoff on commit. | | | | | | o | changeset: 106976:b61683448acc | | | | user: Dan Nicolaescu | | | | date: Sun Jan 24 13:08:53 2010 -0800 | | | | summary: (xterm-maybe-set-dark-background-mode): Rename | | | | -- Thierry Volpiatto