From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: RefTeX Merge Date: Wed, 26 Sep 2012 16:59:17 +0900 Message-ID: <87ehlpmcyy.fsf@uwakimon.sk.tsukuba.ac.jp> 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; charset=utf-8 X-Trace: ger.gmane.org 1348646376 30425 80.91.229.3 (26 Sep 2012 07:59:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 26 Sep 2012 07:59:36 +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 09:59:41 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 1TGmWy-0003wD-RU for ged-emacs-devel@m.gmane.org; Wed, 26 Sep 2012 09:59:40 +0200 Original-Received: from localhost ([::1]:46622 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGmWt-0005bq-Rx for ged-emacs-devel@m.gmane.org; Wed, 26 Sep 2012 03:59:35 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:48867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGmWl-0005a2-TM for emacs-devel@gnu.org; Wed, 26 Sep 2012 03:59:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGmWe-0000HF-5m for emacs-devel@gnu.org; Wed, 26 Sep 2012 03:59:27 -0400 Original-Received: from mgmt2.sk.tsukuba.ac.jp ([130.158.97.224]:58156) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGmWd-0000Gl-Sf for emacs-devel@gnu.org; Wed, 26 Sep 2012 03:59:20 -0400 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mgmt2.sk.tsukuba.ac.jp (Postfix) with ESMTP id 5CEDA9708BE; Wed, 26 Sep 2012 16:59:17 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id 1DF491A3271; Wed, 26 Sep 2012 16:59:17 +0900 (JST) In-Reply-To: <87haqlwbya.fsf@caeruleus.net> X-Mailer: VM 8.0.12-devo-585 under 21.5 (beta32) "habanero" b0d40183ac79 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 130.158.97.224 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:153565 Archived-At: Ralf Angeli writes: > 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. DVCS means never having to say you're sorry. And I mean *never*.[1] Remember, all dangerous operations can be conducted on a copy of the repo. All it costs is a small amount of disk space for a short period of time. > 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 This isn't possible in bzr, because bzr tracks "file containers", and there is no provision for identifying "containers" from repositories without a common ancestor. No matter how you slice it, you're going to get an add-add conflict unless you delete one copy or the other first. I can see how to do this in git, but it wouldn't be pleasant (both ugly and painstaking, but you'd probably end up with a usable history). Why do you want to do that, anyway? What are these files that exist in both repos? Do they really have independent lines of development in both repos? Or is one a slightly tweaked copy of the other? > and the description of `bzr join' talks about combining a tree with > a subtree. Yup. Seems to me that is what you *should* want to do. If this falls afoul of RMS's preference for "sufficient number of files" in a subtree, fix that *after* the join by bzr-move'ing the files into the appropriate place. > What would be the steps involved? I can't give specific advice without answers to the questions above. Footnotes: [1] Well, until you push. ;-)