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: RefTeX Merge Date: Wed, 26 Sep 2012 09:20:47 -0400 Message-ID: References: <877grkehl2.fsf@caeruleus.net> <505F574D.1050707@cs.ucla.edu> <876274lzio.fsf@gnu.org> <871uhri21g.fsf@caeruleus.net> <878vbyehrg.fsf@thinkpad.tsdh.de> <87haqlwbya.fsf@caeruleus.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1348665655 2897 80.91.229.3 (26 Sep 2012 13:20:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 26 Sep 2012 13:20:55 +0000 (UTC) Cc: emacs-devel@gnu.org To: Ralf Angeli Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Sep 26 15:21:00 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TGrXw-0003f6-EJ for ged-emacs-devel@m.gmane.org; Wed, 26 Sep 2012 15:21:00 +0200 Original-Received: from localhost ([::1]:53223 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGrXr-0001qF-3a for ged-emacs-devel@m.gmane.org; Wed, 26 Sep 2012 09:20:55 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:36341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGrXp-0001q8-CC for emacs-devel@gnu.org; Wed, 26 Sep 2012 09:20:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGrXo-0003xc-AB for emacs-devel@gnu.org; Wed, 26 Sep 2012 09:20:53 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:9472) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGrXo-0003od-6J for emacs-devel@gnu.org; Wed, 26 Sep 2012 09:20:52 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EAG6Zu09FxLT4/2dsb2JhbABEtBGBCIIVAQEEAVYjBQsLNBIUGA0kLoduBboJkEQDozOBWIMF X-IronPort-AV: E=Sophos;i="4.75,637,1330923600"; d="scan'208";a="200007805" Original-Received: from 69-196-180-248.dsl.teksavvy.com (HELO pastel.home) ([69.196.180.248]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 26 Sep 2012 09:20:47 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id AA7385938D; Wed, 26 Sep 2012 09:20:47 -0400 (EDT) In-Reply-To: <87haqlwbya.fsf@caeruleus.net> (Ralf Angeli's message of "Wed, 26 Sep 2012 08:11:09 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:153580 Archived-At: > I tried to get some information about `brz join' but there does not seem > to be much available. And given the problems with the command discussed > on emacs-devel it looks a bit dangerous. Here's how it could work: bzr co .../emacs/trunk cd trunk/lisp/textmodes bzr co .../reftex/trunk reftex bzr join reftex bzr mv reftex/foo bar bzr mv ... bzr rm reftex bzr commit locally make sure the resulting repository works right Just make sure the reftex bzr tree hasn't gone through a "bzr-git" translation because otherwise the resulting branch may trigger a bug in bzr when you later checkout a new copy of that branch (at least that seems to be the problem we bumped into in the `elpa' branch). "bzr join" has worked reliably for me as long as I didn't try to join a repository converted by the bzr-git plugin. But I suspect that bzr-hg might trigger the same problems. > Also, I'm not yet sure if it would be the right tool for the job because > we want to do a merge of files existing in both repositories and the > description of `bzr join' talks about combining a tree with a subtree. Indeed, the above leads to having two copies of the reftex files, so you have to choose between the two and Bazaar won't know that they were really the same files. So it's not necessarily the best solution, depending on which history you want to keep and how important it is to preserve it directly in the Emacs repository's metadata (as opposed to just as a ChangeLog file or a commit log text). Stefan