From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Uday S Reddy Newsgroups: gmane.emacs.devel Subject: Re: base Date: Mon, 23 Aug 2010 11:38:19 +0100 Message-ID: References: <20100822120642.GA1794@muc.de> <87bp8uzu9d.fsf@mithlond.arda> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Trace: dough.gmane.org 1282559938 22320 80.91.229.12 (23 Aug 2010 10:38:58 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 23 Aug 2010 10:38:58 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 23 12:38:57 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 1OnUQa-0006eN-Ns for ged-emacs-devel@m.gmane.org; Mon, 23 Aug 2010 12:38:57 +0200 Original-Received: from localhost ([127.0.0.1]:42956 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnUQZ-0002KE-Gq for ged-emacs-devel@m.gmane.org; Mon, 23 Aug 2010 06:38:56 -0400 Original-Received: from [140.186.70.92] (port=39358 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnUQC-0002Eu-69 for emacs-devel@gnu.org; Mon, 23 Aug 2010 06:38:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OnUQA-0007Du-Vh for emacs-devel@gnu.org; Mon, 23 Aug 2010 06:38:32 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:35831) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OnUQA-0007Da-OH for emacs-devel@gnu.org; Mon, 23 Aug 2010 06:38:30 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1OnUQ8-0006Kc-SA for emacs-devel@gnu.org; Mon, 23 Aug 2010 12:38:28 +0200 Original-Received: from acws-0068.cs.bham.ac.uk ([147.188.194.56]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 23 Aug 2010 12:38:28 +0200 Original-Received: from u.s.reddy by acws-0068.cs.bham.ac.uk with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 23 Aug 2010 12:38:28 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 29 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: acws-0068.cs.bham.ac.uk User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) In-Reply-To: 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:129069 Archived-At: Eli Zaretskii wrote: > The bzr docs include a section on rebasing as well: > > http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/adv_merging.html > > (look near the end). Indeed, the last paragraph explains the attitude of Bazaar developers: Note: Some _users coming from central VCS tools_ with poor merge tracking like rebasing because it’s similar to how they are use to working in older tools, or because _“perfectly clean” history seems important_. Before rebasing in Bazaar, think about whether a normal merge is a better choice. [Emphasis added] I don't have any trouble with the next sentence: In particular, rebasing a private branch before sharing it is OK but rebasing after sharing a branch with someone else is strongly discouraged. Here is Linus Torlvalds explaining this point in more detail: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html Cheers, Uday