From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Switching to bzr: what remains to be done? Date: Tue, 09 Dec 2008 14:55:08 -0500 Message-ID: References: <87vdtu332o.fsf@red-bean.com> <87hc5ef9mf.fsf@notengoamigos.org> <87zlj5dvij.fsf@notengoamigos.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1228852537 17613 80.91.229.12 (9 Dec 2008 19:55:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 9 Dec 2008 19:55:37 +0000 (UTC) Cc: Karl Fogel , emacs-devel@gnu.org To: Jason Earl Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 09 20:56:41 2008 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 1LA8h4-000203-5S for ged-emacs-devel@m.gmane.org; Tue, 09 Dec 2008 20:56:30 +0100 Original-Received: from localhost ([127.0.0.1]:57069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LA8ft-0000lP-6U for ged-emacs-devel@m.gmane.org; Tue, 09 Dec 2008 14:55:17 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LA8fo-0000kQ-Dm for emacs-devel@gnu.org; Tue, 09 Dec 2008 14:55:12 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LA8fm-0000ht-UX for emacs-devel@gnu.org; Tue, 09 Dec 2008 14:55:11 -0500 Original-Received: from [199.232.76.173] (port=46244 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LA8fm-0000hZ-MO for emacs-devel@gnu.org; Tue, 09 Dec 2008 14:55:10 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:44069) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LA8fm-0005g3-Fr for emacs-devel@gnu.org; Tue, 09 Dec 2008 14:55:10 -0500 Original-Received: from alfajor.home (vpn-132-204-232-76.acd.umontreal.ca [132.204.232.76]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id mB9Jt8pc004929; Tue, 9 Dec 2008 14:55:09 -0500 Original-Received: by alfajor.home (Postfix, from userid 20848) id CBFBD1C91C; Tue, 9 Dec 2008 14:55:08 -0500 (EST) In-Reply-To: <87zlj5dvij.fsf@notengoamigos.org> (Jason Earl's message of "Tue, 09 Dec 2008 12:00:04 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3165=0 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:106734 Archived-At: > OK, I have some ideas on how to make this work. I will do a bit of > experimenting and see what I can come up with. I've played around with > branches where I have moved files around and bzr merges that just fine. > This should (hopefully) just be an extreme example. The main issue is that the two branches will probably not share a common ancestor at first. Typically the problem is keeping track of file identities: in the Gnus repository lisp/gnus.el will have one identity and in Emacs's lisp/gnus/gnus.el will have another, so convincing Bzr that those two files correspond to each other may simply be impossible (in Arch, the identity is user-visible, set in the "arch-tag:" line or in the .arch-ids-.id file, so matching the two is not difficult). Stefan