Re: merge conlict?

[Teemu Likonen]

On 2010-01-25 09:43 (+0200), Eli Zaretskii wrote:

> What does this "merge conflict" in the commit message mean? Why do so
> many unrelated files (see below) seem to be modified in one go?

Yes, the list of changed files is quite confusing. It's against a merge
parent which Bazaar chooses implicitly and from trunk's point of view
it's the "wrong" parent. From the point of view of truly distributed
development it doesn't matter because no branch is more important than
any other. But yes, Bazaar has this trunk mentality and treats the so
called left-most parent more important.

It would probably help if Bazaar supported combined diff format. With
Git we can trivially see the actual changes introduced by the merge
commit:


$ git show b8de0d6

commit b8de0d6b29e0b5138c9c3edfd4b0d72bd583f789
Merge: 941488a 49a939e
Author: Mark A. Hershberger <address@hidden>
Date:   2010-01-24 23:52:26 -0500

    merge conflict

diff --cc doc/emacs/ChangeLog
index e9ab5ed,7d7002a..39ffa2c
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@@ -1,8 -1,7 +1,12 @@@
- 2010-01-19  Mark A. Hershberger  <address@hidden>
++2010-01-24  Mark A. Hershberger  <address@hidden>
 +
 +      * programs.texi (Other C Commands): Replace reference to obsolete
 +      c-subword-mode.
 +
+ 2010-01-21  Glenn Morris  <address@hidden>
+ 
+       * trouble.texi (Bugs): Fix PROBLEMS keybinding.
+ 
  2010-01-12  Glenn Morris  <address@hidden>
  
        * trouble.texi (Checklist): Use bug-gnu-emacs rather than
diff --cc doc/misc/ChangeLog
index 50673dc,3d39b10..fe34433
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
- 2010-01-19  Mark A. Hershberger  <address@hidden>
 -2010-01-21  Katsumi Yamaoka  <address@hidden>
++2010-01-24  Mark A. Hershberger  <address@hidden>
+ 
+       * gnus.texi (Score File Format): Fix typo.
+ 
++2010-01-21  Katsumi Yamaoka  <address@hidden>
 +
 +      * cc-mode.texi: Replace references to obsolete c-subword-mode.
 +
  2010-01-18  Juanma Barranquero  <address@hidden>
  
        * ada-mode.texi (Project File Overview): Fix typo.
diff --cc lisp/ChangeLog
index 86680e2,50da1d9..ed9e8ae
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,84 +1,88 @@@
- 2010-01-19  Mark A. Hershberger  <address@hidden>
++2010-01-24  Mark A. Hershberger  <address@hidden>
 +
 +      * progmodes/python.el: Replace reference to obsolete c-subward-mode.
 +
+ 2010-01-24  Dan Nicolaescu  <address@hidden>
+ 
+       Remove support for adding --signoff on commit.
+       Future support will use an incompatible generic mechanism.
+       * vc-git.el (vc-git-add-signoff): Remove variable.
+       (vc-git-toggle-signoff): Remove function.
+       (vc-git-extra-menu-map): Do not bind vc-git-toggle-signoff.
+ 
+       * term/xterm.el (xterm-maybe-set-dark-background-mode): Rename
+       from xterm-set-background-mode.  Return t if the background mode
+       was set.
+       (terminal-init-xterm): Move tty-set-up-initial-frame-faces
+       earlier, call it again in case the background mode has changed.
+ 
+ 2010-01-23  Dmitri Paduchikh  <address@hidden>  (tiny change)
+ 
+       * emacs-lisp/advice.el (ad-set-orig-definition): Fix typo
+       (Bug#3541).
+ 
+ 2010-01-23  Chong Yidong  <address@hidden>
+ 
+       * emacs-lisp/assoc.el (aelement): Doc fix.
+       (aput, adelete, amake): Use lexical-let (Bug#5450).
+ 
+ 2010-01-23  Stephen Leake  <address@hidden>
+ 
+         * progmodes/ada-mode.el (ada-in-paramlist-p): Pragma syntax
+       is the same as subprogram call, not declaration.  (Bug#5435).
+ 
+ 2010-01-23  Michael Albinus  <address@hidden>
+ 
+       * net/tramp-smb.el (tramp-smb-conf): New defcustom.
+       (tramp-smb-maybe-open-connection): Use it.
+ 
+ 2010-01-22  Michael Albinus  <address@hidden>
+ 
+       * net/tramp-imap.el (top): Autoload needed packages.  (Bug#5448)
+ 
+ 2010-01-22  Stefan Monnier  <address@hidden>
+ 
+       * mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyte
+       just because we see "encoding: 8bit".
+       * mail/rmail.el (rmail-show-message-1): Decode the body's QP into bytes.
+ 
+ 2010-01-22  Chong Yidong  <address@hidden>
+ 
+       * isearch.el (isearch-allow-scroll): Doc fix (Bug#5446).
+ 
+ 2010-01-22  Eli Zaretskii  <address@hidden>
+ 
+       * jka-compr.el (jka-compr-load): If load-file is not in
+       load-history, try its file-truename version.  (bug#5447)
+ 
+ 2010-01-21  Alan Mackenzie  <address@hidden>
+ 
+       Fix a situation where deletion of a cpp construct throws an error.
+       * progmodes/cc-engine.el (c-invalidate-state-cache): Before
+       invoking c-with-all-but-one-cpps-commented-out, check that the
+       special cpp construct is still in the buffer.
+       (c-parse-state): Record the special cpp with markers, not numbers.
+ 
+ 2010-01-21  Kenichi Handa  <address@hidden>
+ 
+       * textmodes/sgml-mode.el (sgml-maybe-name-self): No need to
+       process last-command-event, as it is now decoded first (Bug#5380).
+ 
+ 2010-01-20  Chong Yidong  <address@hidden>
+ 
+       * term.el (term-send-raw-meta): Revert 2009-12-04 change (Bug#5330).
+ 
+ 2010-01-20  Glenn Morris  <address@hidden>
+ 
+       * indent.el (tab-always-indent): Fix custom-type.
+ 
+ 2010-01-19  Alan Mackenzie  <address@hidden>
+ 
+       * progmodes/cc-defs.el: Fix bug#5395: typing '#' in an empty
+       buffer throws "args out of range".
+       (c-set-cpp-delimiters, c-clear-cpp-delimiters): Check for EOB
+       playing the role of delimiter.
+ 
  2010-01-18  Stephen Leake  <address@hidden>
  
        * lisp/progmodes/ada-mode.el: Fix bug#5400.