From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Tue, 26 Jan 2010 10:38:19 +0900 Message-ID: <87my01ejck.fsf@uwakimon.sk.tsukuba.ac.jp> References: <87636q2x2q.fsf@telefonica.net> <87my021ham.fsf@telefonica.net> <87iqaq1f09.fsf@telefonica.net> <877hr61c68.fsf@telefonica.net> <87iqaqyy6s.fsf@telefonica.net> <87eileys7h.fsf@telefonica.net> <87aaw2yrec.fsf@telefonica.net> <87r5pexbm6.fsf@telefonica.net> <87my02xa5l.fsf@telefonica.net> <87iqaqx81j.fsf@telefonica.net> <87eildyj1q.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264469502 26162 80.91.229.12 (26 Jan 2010 01:31:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 01:31:42 +0000 (UTC) Cc: =?iso-8859-1?Q?=D3scar?= Fuentes , emacs-devel@gnu.org To: David Reitter Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 02:31: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 1NZaHD-0002gJ-T3 for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 02:31:32 +0100 Original-Received: from localhost ([127.0.0.1]:33876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZaHE-0000Ow-Oc for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 20:31:32 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZaH9-0000NQ-5E for emacs-devel@gnu.org; Mon, 25 Jan 2010 20:31:27 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZaH4-0000FX-79 for emacs-devel@gnu.org; Mon, 25 Jan 2010 20:31:26 -0500 Original-Received: from [199.232.76.173] (port=53749 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZaH3-0000F7-VO for emacs-devel@gnu.org; Mon, 25 Jan 2010 20:31:21 -0500 Original-Received: from mtps02.sk.tsukuba.ac.jp ([130.158.97.224]:43201) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZaH3-0006xx-Fx for emacs-devel@gnu.org; Mon, 25 Jan 2010 20:31:21 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mtps02.sk.tsukuba.ac.jp (Postfix) with ESMTP id DECEF820E; Tue, 26 Jan 2010 10:31:17 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 4EBCB11EF64; Tue, 26 Jan 2010 10:38:20 +0900 (JST) In-Reply-To: X-Mailer: VM 8.0.12-devo-585 under 21.5 (beta29) "garbanzo" a03421eb562b XEmacs Lucid (x86_64-unknown-linux) 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:120408 Archived-At: David Reitter writes: > http://wiki.bazaar.canonical.com/Rebase > Would this be useful? To some people. Others just want to commit, merge, and forget. > If the commits on the private branch aren't clean, For most people, they probably are. Based on the workflows people have described as desirable and historical, private branches are likely to be generally short, and induced by lack of physical contact with the upstream rather a desire to isolate the branch. That is, they had every intent of making a high-quality commit directly to trunk, but the network failed or something. Other people will be used to working with git or Mercurial, and likely will have more significant private branches of uncertain quality. > Does bzr generally make the merged history available? Or would the > branch need to be pushed? I'm not sure what you're asking. When you push or pull from one pbranch to another, bzr transfers all commits reachable from the merge commit to the target branch. > (Git pushes all reachable revisions, I think, which is why I'm > assuming bzr does the same, but maybe I'm wrong.) Your phrasing is ambiguous. The only git command that defaults to transferring *all* reachable revisions is clone. bzr has no analog to that yet, but it is planned and a fair amount of work has been done AIUI. git push will push all revisions reachable from the refs named on the command line, defaulting to those reachable from HEAD. This is the same as bzr. git push can be configured to default to pushing a set of refs and all commits reachable from them. AFAIK bzr has no analog, nor is one planned.