From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ralf Angeli Newsgroups: gmane.emacs.devel Subject: Re: RefTeX Merge Date: Wed, 26 Sep 2012 08:11:09 +0200 Message-ID: <87haqlwbya.fsf@caeruleus.net> References: <877grkehl2.fsf@caeruleus.net> <505F574D.1050707@cs.ucla.edu> <876274lzio.fsf@gnu.org> <871uhri21g.fsf@caeruleus.net> <878vbyehrg.fsf@thinkpad.tsdh.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1348639883 13943 80.91.229.3 (26 Sep 2012 06:11:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 26 Sep 2012 06:11:23 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Sep 26 08:11:28 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 1TGkqF-0005zm-Ta for ged-emacs-devel@m.gmane.org; Wed, 26 Sep 2012 08:11:28 +0200 Original-Received: from localhost ([::1]:48105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGkqA-0002ys-QE for ged-emacs-devel@m.gmane.org; Wed, 26 Sep 2012 02:11:22 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGkq1-0002jN-B9 for emacs-devel@gnu.org; Wed, 26 Sep 2012 02:11:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGkq0-0003VE-Ah for emacs-devel@gnu.org; Wed, 26 Sep 2012 02:11:13 -0400 Original-Received: from moutng.kundenserver.de ([212.227.126.186]:60954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGkq0-0003V4-1K for emacs-devel@gnu.org; Wed, 26 Sep 2012 02:11:12 -0400 Original-Received: from photon (p54A509A1.dip0.t-ipconnect.de [84.165.9.161]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0MLEXd-1TH1x62641-000Iq3; Wed, 26 Sep 2012 08:11:09 +0200 In-Reply-To: <878vbyehrg.fsf@thinkpad.tsdh.de> (Tassilo Horn's message of "Tue, 25 Sep 2012 08:30:43 +0200") X-Provags-ID: V02:K0:jJ99rNQ9pm4nS9rHV67SD5edx7xRjjF+cWmXU28FkmW jkD4Acrxd9YfoWkNBiJslCqzEiGk1IAnPuXXEuO2nKrqkC7Cu1 q5kQekGi07253cV7RXXAiU/b9sQYUIYiILduynOA8YtUeiU6Mb z+qEbLPMyjIbvrzJpFn30EyP4IT38KTqctg5kly5DKkrlb8Kje BN3MWcpN6GaZSXAecpf/jDwvxVITNzngBzNNXzxWvtJlN4r+tM xkeR7XfKs7WFSoGqTj01krXgZd/h3hDB69xUpDZbW++Kjfaall lAEgVK34VTfKNLhrgXdRLRWohgJj16znWPJeyMcRQE1tM/z8w= = X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.126.186 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:153554 Archived-At: * Tassilo Horn (2012-09-25) writes: > Ralf Angeli writes: > >>> (Normally, one would use bzr join to preserve the history, but bzr >>> join seems to be badly broken.) >> >> Now that would be a nice solution. RefTeX is currently maintained in >> a CVS repository, though. I'm not sure if this makes matters better >> or worse. > > I can import the reftex CVS repository into a bzr or git repository if > it helps to get the job done. I've already written the needed scripts > and configurations for cvs2{bzr,git} for converting AUCTeX, and they'll > probably work well with reftex, too. 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. 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. What would be the steps involved? Commit the merged files in both repositories, convert the RefTeX CVS repo to bzr and then join the lisp directory of the RefTeX bzr repo into the Emacs repo? Or would the merge be part of the join? -- Ralf