From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?Llu=C3=ADs?= Newsgroups: gmane.emacs.devel,gmane.comp.version-control.bazaar-ng.general,gmane.emacs.cedet Subject: Re: [CEDET-devel] transplant revisions between unrelated projects Date: Tue, 01 May 2012 19:53:48 +0200 Message-ID: <87lilbaitv.fsf@fimbulvetr.bsc.es> References: <874nsigwur.fsf@fimbulvetr.bsc.es> <87pqb4lhdk.fsf@fimbulvetr.bsc.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1335894842 14208 80.91.229.3 (1 May 2012 17:54:02 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 1 May 2012 17:54:02 +0000 (UTC) Cc: bazaar@lists.canonical.com, cedet-devel@lists.sourceforge.net, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue May 01 19:54:01 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 1SPHGy-00068U-EL for ged-emacs-devel@m.gmane.org; Tue, 01 May 2012 19:54:00 +0200 Original-Received: from localhost ([::1]:54521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPHGx-0005rA-OI for ged-emacs-devel@m.gmane.org; Tue, 01 May 2012 13:53:59 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:44814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPHGt-0005qd-Oh for emacs-devel@gnu.org; Tue, 01 May 2012 13:53:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPHGr-0001bp-Kh for emacs-devel@gnu.org; Tue, 01 May 2012 13:53:55 -0400 Original-Received: from mailout-de.gmx.net ([213.165.64.22]:40153) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1SPHGr-0001Vn-AP for emacs-devel@gnu.org; Tue, 01 May 2012 13:53:53 -0400 Original-Received: (qmail invoked by alias); 01 May 2012 17:53:49 -0000 Original-Received: from unknown (EHLO localhost) [84.88.51.85] by mail.gmx.net (mp070) with SMTP; 01 May 2012 19:53:49 +0200 X-Authenticated: #12333383 X-Provags-ID: V01U2FsdGVkX18Ltkg7sBILOmjB6ZxX59kklRFy2xTXLtU4jFK4Nq 8Cyw4eqxpK2nZ/ In-Reply-To: (Stefan Monnier's message of "Mon, 30 Apr 2012 09:07:33 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 213.165.64.22 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:150188 gmane.comp.version-control.bazaar-ng.general:74121 gmane.emacs.cedet:5782 Archived-At: Stefan Monnier writes: >>>> You can find the code here: >>>> https://launchpad.net/bzr-tp/trunk >>>> This will give some more details on how to use it: >>>> bzr help transplant >>> Could you describe (or point to a description) of what it actually does? >> Could be seen like an inter-project merge tool, where history is kept >> (including merges), as long as the "transplanted" revisions affect >> files identified as "transplantable". >> For example, emacs->cedet synchronization would transplant files >> "lisp/emacs-lisp/eieio\(.*\).el" from emacs into >> "lisp/eieio/eieio\1.el" in cedet, where cedet controls what to >> transplant and when (transplant metadata is committed into the cedet >> branch): > I understand that, but I don't understand how it does it. It seems like > it works a bit like a "rebase". So, what does "history is kept" > mean exactly? Will a "bzr tp-from" (once "tp-from-finish"ed) appear > as a merge in the DAG? AFAIU it's a mix between rebasing and merging, as the shape of the DAG in the transplanted revisions from "emacs" should be kept in "cedet". Example of log showing all levels (-n 0) in "emacs" (c* are the commit messages): * c1 * c2 * [merge] c3 * c4 * c5 * c6 * c7 Assuming "c1" was already transplanted into cedet sometime in the past, this is what you should get after the transplant from "emacs" into "cedet": * [merge] Transplant from 'emacs': .. * c2 Transplant from 'emacs': * [merge] c3 Transplant from 'emacs': * c4 Transplant from 'emacs': * c5 Transplant from 'emacs': * c6 Transplant from 'emacs': * c7 Transplant from 'emacs': Sorry if I haven't used the appropriate bazaar concepts. You can see the main algorithm here: http://bazaar.launchpad.net/~lluis.vilanova/bzr-tp/trunk/view/head:/transplant.py#L250 Lluis -- "And it's much the same thing with knowledge, for whenever you learn something new, the whole world becomes that much richer." -- The Princess of Pure Reason, as told by Norton Juster in The Phantom Tollbooth