From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Jason Earl <jearl@notengoamigos.org>
Cc: Karl Fogel <kfogel@red-bean.com>, emacs-devel@gnu.org
Subject: Re: Switching to bzr: what remains to be done?
Date: Mon, 08 Dec 2008 22:32:15 -0500 [thread overview]
Message-ID: <jwv8wqqujcl.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87hc5ef9mf.fsf@notengoamigos.org> (Jason Earl's message of "Mon, 08 Dec 2008 17:57:44 -0700")
> Actually the repository that is incremental is:
> http://bzr.notengoamigos.org/emacs/trunk/
Sorry, that was a typo, yes.
>> - includes renames. Apparently none of the conversion tools provide
>> that since the info is only available in the Arch repository right
>> now, but that has commits that bundle up several CVS commit into one.
> I do have an import of the Arch repository, but I wouldn't recommend it
> as it throws away most of the CVS revision history. I have no idea how
> you would go about trying to merge the Arch information into one of the
> other repositories.
I don't either. Andreas somehow manages to extract the merge info from
the Arch archive and mix it up with the CVS data to generate&update its
Git repository. Not sure if something similar can be done for the renames.
>> - is complete. The http://bzr.notengoamigos.org/emacs-merges/trunk/
>> seems to have some missing elements (IIRC a few CVS tags were
>> missing).
> I think that this could easily be fixed. Could you give an example from
> emacs-merges?
I meant the http://bzr.notengoamigos.org/emacs/trunk/ branch, sorry.
As far as I can tell the emacs-merges branch is complete.
>> Another issue that AFAIK nobody has worked on, is how are we going to
>> handle the Gnus<->Emacs synchronization in the future. I expect this to
>> be doable somehow, maybe by still going through Arch, but of course it
>> would probably be preferable to do it directly within Bzr, and in any
>> case it will require for someone to figure it out.
> I don't know how this works so it is hard to comment :).
I think it works pretty much as follows (except in Arch). To set things
up, the following was done once:
- cd .../emacs
- bzr pull
- bzr merge bzr://.../gnus
- tons of random bogus conflicts, resolve them somehow
at this point, the VCS (i.e. hopefully Bzr can do it, Arch clearly does)
has figure out that Gnus's "lisp/gnus.el" corresponds to Emacs's
"lisp/gnus/gnus.el" and things like that, so you can then subsequently
treat the two repositories as two branches of the same code, just where
one holds a lot more files than the other. So you can do
- bzr merge bzr://.../gnus
and changes will properly get merged into the right files.
Now of course, I don't know how the two-way sync can work, I'm not even
sure how Miles does it for Arch.
> Unfortunately updating from CVS and getting the merge info seem to be
> mutually exclusive.
Clearly Andreas manages to do it, so there should be a way to do that
for Bzr as well.
Stefan
next prev parent reply other threads:[~2008-12-09 3:32 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-08 18:59 Switching to bzr: what remains to be done? Karl Fogel
2008-12-08 19:29 ` Dan Nicolaescu
2008-12-08 19:51 ` Karl Fogel
2008-12-08 21:44 ` Stefan Monnier
2008-12-11 22:43 ` Karl Fogel
2008-12-08 19:54 ` Stefan Monnier
2008-12-09 0:59 ` Stephen J. Turnbull
[not found] ` <878wqqf8gr.fsf@notengoamigos.org>
2008-12-09 3:16 ` Stefan Monnier
[not found] ` <87hc5ef9mf.fsf@notengoamigos.org>
2008-12-09 3:32 ` Stefan Monnier [this message]
2008-12-09 9:33 ` Andreas Schwab
[not found] ` <87zlj5dvij.fsf@notengoamigos.org>
2008-12-09 19:55 ` Stefan Monnier
2008-12-09 2:45 ` Dan Nicolaescu
2008-12-11 20:23 ` Karl Fogel
2008-12-17 22:59 ` Karl Fogel
2008-12-18 8:00 ` Tassilo Horn
2008-12-18 16:28 ` Karl Fogel
2008-12-19 8:22 ` Tassilo Horn
2008-12-19 8:29 ` Giorgos Keramidas
2008-12-18 20:26 ` Dan Nicolaescu
2009-01-05 0:00 ` Tom Tromey
2009-01-05 2:14 ` Stefan Monnier
2009-01-05 2:42 ` Tom Tromey
2009-01-05 4:04 ` Stefan Monnier
2009-01-06 0:01 ` Richard M Stallman
-- strict thread matches above, loose matches on Subject: below --
2008-12-08 16:32 Karl Fogel
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=jwv8wqqujcl.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=jearl@notengoamigos.org \
--cc=kfogel@red-bean.com \
/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.