From: Lluís <xscript@gmx.net>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: bazaar@lists.canonical.com, cedet-devel@lists.sourceforge.net,
emacs-devel@gnu.org
Subject: Re: [CEDET-devel] transplant revisions between unrelated projects
Date: Tue, 01 May 2012 19:53:48 +0200 [thread overview]
Message-ID: <87lilbaitv.fsf@fimbulvetr.bsc.es> (raw)
In-Reply-To: <jwv8vhdbcf1.fsf-monnier+gmane.comp.version-control.bazaar-ng.general@gnu.org> (Stefan Monnier's message of "Mon, 30 Apr 2012 09:07:33 -0400")
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': <revid of c2>..<revid of c7>
* c2
Transplant from 'emacs': <revid of c2>
* [merge] c3
Transplant from 'emacs': <revid of c3>
* c4
Transplant from 'emacs': <revid of c4>
* c5
Transplant from 'emacs': <revid of c5>
* c6
Transplant from 'emacs': <revid of c6>
* c7
Transplant from 'emacs': <revid of c7>
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
prev parent reply other threads:[~2012-05-01 17:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-17 16:13 transplant revisions between unrelated projects Lluís
2012-04-18 21:42 ` Stefan Monnier
2012-04-19 0:01 ` Lluís
2012-04-30 13:07 ` Stefan Monnier
2012-05-01 17:53 ` Lluís [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lilbaitv.fsf@fimbulvetr.bsc.es \
--to=xscript@gmx.net \
--cc=bazaar@lists.canonical.com \
--cc=cedet-devel@lists.sourceforge.net \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.