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 13:33:38 +0200 Message-ID: <87sk9ufmgd.fsf@mithlond.arda> References: <83vdeq634g.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264419388 1359 80.91.229.12 (25 Jan 2010 11:36:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 11:36:28 +0000 (UTC) Cc: "Mark A. Hershberger" , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 12:36:20 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 1NZNEx-0006dy-4j for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 12:36:19 +0100 Original-Received: from localhost ([127.0.0.1]:57507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZNEw-0000sl-RA for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 06:36:19 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZNCz-0000XS-CQ for emacs-devel@gnu.org; Mon, 25 Jan 2010 06:34:17 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZNCu-0000Vy-9w for emacs-devel@gnu.org; Mon, 25 Jan 2010 06:34:16 -0500 Original-Received: from [199.232.76.173] (port=59327 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZNCt-0000Vo-S8 for emacs-devel@gnu.org; Mon, 25 Jan 2010 06:34:11 -0500 Original-Received: from mta-out.inet.fi ([195.156.147.13]:51305 helo=kirsi2.inet.fi) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZNCo-0005AJ-28; Mon, 25 Jan 2010 06:34:06 -0500 Original-Received: from mithlond.arda (84.251.132.215) by kirsi2.inet.fi (8.5.014) id 4B17EFA60247BBAF; Mon, 25 Jan 2010 13:33:56 +0200 Original-Received: from dtw by mithlond.arda with local (Exim 4.69) (envelope-from ) id 1NZNCM-0002vg-Kb; Mon, 25 Jan 2010 13:33:38 +0200 In-Reply-To: <83vdeq634g.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 25 Jan 2010 09:43:43 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:120354 Archived-At: 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 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 ++2010-01-24 Mark A. Hershberger + + * programs.texi (Other C Commands): Replace reference to obsolete + c-subword-mode. + + 2010-01-21 Glenn Morris + + * trouble.texi (Bugs): Fix PROBLEMS keybinding. + 2010-01-12 Glenn Morris * 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 -2010-01-21 Katsumi Yamaoka ++2010-01-24 Mark A. Hershberger + + * gnus.texi (Score File Format): Fix typo. + ++2010-01-21 Katsumi Yamaoka + + * cc-mode.texi: Replace references to obsolete c-subword-mode. + 2010-01-18 Juanma Barranquero * 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 ++2010-01-24 Mark A. Hershberger + + * progmodes/python.el: Replace reference to obsolete c-subward-mode. + + 2010-01-24 Dan Nicolaescu + + 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 (tiny change) + + * emacs-lisp/advice.el (ad-set-orig-definition): Fix typo + (Bug#3541). + + 2010-01-23 Chong Yidong + + * emacs-lisp/assoc.el (aelement): Doc fix. + (aput, adelete, amake): Use lexical-let (Bug#5450). + + 2010-01-23 Stephen Leake + + * 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 + + * net/tramp-smb.el (tramp-smb-conf): New defcustom. + (tramp-smb-maybe-open-connection): Use it. + + 2010-01-22 Michael Albinus + + * net/tramp-imap.el (top): Autoload needed packages. (Bug#5448) + + 2010-01-22 Stefan Monnier + + * 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 + + * isearch.el (isearch-allow-scroll): Doc fix (Bug#5446). + + 2010-01-22 Eli Zaretskii + + * 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 + + 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 + + * 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 + + * term.el (term-send-raw-meta): Revert 2009-12-04 change (Bug#5330). + + 2010-01-20 Glenn Morris + + * indent.el (tab-always-indent): Fix custom-type. + + 2010-01-19 Alan Mackenzie + + * 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 * lisp/progmodes/ada-mode.el: Fix bug#5400.