From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 12:27:36 +0100 Message-ID: <87hbqa2zmf.fsf@telefonica.net> References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> 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 1264418910 32062 80.91.229.12 (25 Jan 2010 11:28:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 11:28:30 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 12:28:22 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 1NZN7F-00049P-AP for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 12:28:21 +0100 Original-Received: from localhost ([127.0.0.1]:40898 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZN7G-0006er-E8 for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 06:28:22 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZN75-0006bc-8J for emacs-devel@gnu.org; Mon, 25 Jan 2010 06:28:11 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZN70-0006Wl-Av for emacs-devel@gnu.org; Mon, 25 Jan 2010 06:28:10 -0500 Original-Received: from [199.232.76.173] (port=45890 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZN70-0006Wa-1k for emacs-devel@gnu.org; Mon, 25 Jan 2010 06:28:06 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:34550) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZN6x-0004M8-Sq for emacs-devel@gnu.org; Mon, 25 Jan 2010 06:28:05 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NZN6u-00043G-0Q for emacs-devel@gnu.org; Mon, 25 Jan 2010 12:28:00 +0100 Original-Received: from 92.red-88-24-231.staticip.rima-tde.net ([88.24.231.92]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 25 Jan 2010 12:27:59 +0100 Original-Received: from ofv by 92.red-88-24-231.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 25 Jan 2010 12:27:59 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 54 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 92.red-88-24-231.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:7wnKxajqNTnIYhv9TnP/6Ip3RKo= 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:120353 Archived-At: Andreas Schwab writes: > Óscar Fuentes writes: > >> Andreas Schwab writes: >> >>> Eli Zaretskii writes: >>> >>>>> Not much different from >>>>> eg. yamaoka@jpl.org-20100121085911-ix6bp10z930y7zn8. >>>> >>>> That merge is made of Katsumi Yamaoka's changes. >>> >>> I don't understand that sentence. Can you clarify? >>> >>>> Which is not true for Mark's merge. >>> >>> Both commits merge trunk into a branch. How are they different? >> >> Katsumi Yamaoka merges his changes into trunk, > > No, it merges trunk into a branch. That's right for the specific revid you mention. But what matters here is the effect on trunk's history. Katsumi Yamaoka's merge was merged back into trunk and it was incorporated as merged history. You can't see it unless you explictly ask for the merged history. It does not cause huge diffs, nor large lists of modified files. It is the result of somebranch $ bzr merge ../trunk somebranch $ bzr commit somebranch $ bzr merge ../trunk somebranch $ bzr commit somebranch $ bzr merge ../trunk somebranch $ bzr commit < some more repetitions elided > somebranch $ bzr commit somebranch $ cd ../trunk trunk $ bzr merge ../somebranch trunk $ bzr commit which is precisely what he wiki documentation describes. You have a number of merge commits hiddend in the merged history, but diffs are fine and only the files edited by the committer are marked as modified by the change. OTOH, Mark looks like more somebranch $ bzr merge URL_TO_UPSTREAM_TRUNK somebranch $ bzr commit somebranch $ bzr push URL_TO_UPSTREAM_TRUNK which causes havoc.