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: Installing changes from branches Date: Sat, 03 Apr 2010 17:41:59 +0200 Message-ID: <87tyrsy248.fsf@telefonica.net> References: <4BB702D9.7000102@swipnet.se> <4BB75C2E.5010104@swipnet.se> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: dough.gmane.org 1270309348 27474 80.91.229.12 (3 Apr 2010 15:42:28 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 3 Apr 2010 15:42:28 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 03 17:42: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.69) (envelope-from ) id 1Ny5UL-0007RS-CR for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 17:42:21 +0200 Original-Received: from localhost ([127.0.0.1]:35053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ny5UK-0002XX-Oz for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 11:42:20 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ny5UF-0002XI-96 for emacs-devel@gnu.org; Sat, 03 Apr 2010 11:42:15 -0400 Original-Received: from [140.186.70.92] (port=35807 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ny5UE-0002XA-0h for emacs-devel@gnu.org; Sat, 03 Apr 2010 11:42:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ny5UC-0002ji-SK for emacs-devel@gnu.org; Sat, 03 Apr 2010 11:42:13 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:52133) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ny5UC-0002jX-MH for emacs-devel@gnu.org; Sat, 03 Apr 2010 11:42:12 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Ny5UA-0007Oh-9l for emacs-devel@gnu.org; Sat, 03 Apr 2010 17:42:10 +0200 Original-Received: from 83.32.114.13 ([83.32.114.13]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 03 Apr 2010 17:42:10 +0200 Original-Received: from ofv by 83.32.114.13 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 03 Apr 2010 17:42:10 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 31 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.32.114.13 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.93 (gnu/linux) Cancel-Lock: sha1:1zC52ky/yMQ8KP6lDKm4dsAJ078= X-detected-operating-system: by eggs.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:123128 Archived-At: Jan Djärv writes: [snip] >> Indeed, you can also do that: >> >> cd .../trunk >> bzr merge .../quickfix >> bzr revert --forget-merges >> bzr commit ... >> >> that's virtually the same as "diff&patch": it forgets all about the >> branch's history. > > But according to Óscar Fuentes you must later overwrite your quickfix > branch with a pull --overwrite. I assume you loose local history on > the quickfix branch then? Yes. After the `bzr pull --overwrite' the quickfixes branch becomes identical to `trunk'. Hopefully, for quick fixes the local history is not something so valuable that you want to keep it around. Furthermore, a quick fix is usually made of a single commit, so you end mapping your local commit on `quickfixes' to a single commit on `trunk', which lessens the history loss. > It is all very confusing. Indeed. Bazaar chose to provide a multitude of workflows without requiring an understanding of its fundamental model (which is quite simple.) It is like pretending from someone to learn how to pilot a Jumbo without knowing the purpose of the airplane's wings and tail.