Re: merge conlict?

[Thierry Volpiatto]

Teemu Likonen <address@hidden> 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 <address@hidden>
|  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. <address@hidden>
| |  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. <address@hidden>
| |  date:        Mon Jan 25 08:45:12 2010 +0100
| |  summary:     Merge from trunk
| |
o |  changeset:   106984:c7c26994ef04
| |  user:        Dan Nicolaescu <address@hidden>
| |  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 <address@hidden>
| | |  date:        Mon Jan 25 00:03:35 2010 -0500
| | |  summary:     merge
| | |
| o |  changeset:   106982:6e531c0687e2
| | |  user:        Mark A. Hershberger <address@hidden>
| | |  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 <address@hidden>
| | | |  date:        Sun Jan 24 23:52:26 2010 -0500
| | | |  summary:     merge conflict
| | | |
o---+ |  changeset:   106980:f5df3c57ab2e
  | | |  user:        Eric Hanchrow <address@hidden>
 / / /   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 <address@hidden>
| | | |  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 <address@hidden>
| | | |  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 <address@hidden>
| | | |  date:        Sun Jan 24 13:23:17 2010 -0800
| | | |  summary:     Remove support for adding --signoff on commit.
| | | |
| | o |  changeset:   106976:b61683448acc
| | | |  user:        Dan Nicolaescu <address@hidden>
| | | |  date:        Sun Jan 24 13:08:53 2010 -0800
| | | |  summary:     (xterm-maybe-set-dark-background-mode): Rename
| | | |


-- 
Thierry Volpiatto