From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Ralf Angeli <angeli@caeruleus.net>
Cc: emacs-devel@gnu.org
Subject: Re: RefTeX Merge
Date: Wed, 26 Sep 2012 09:20:47 -0400 [thread overview]
Message-ID: <jwva9wd2alq.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87haqlwbya.fsf@caeruleus.net> (Ralf Angeli's message of "Wed, 26 Sep 2012 08:11:09 +0200")
> 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.
Here's how it could work:
bzr co .../emacs/trunk
cd trunk/lisp/textmodes
bzr co .../reftex/trunk reftex
bzr join reftex
bzr mv reftex/foo bar
bzr mv ...
bzr rm reftex
bzr commit locally
make sure the resulting repository works right
Just make sure the reftex bzr tree hasn't gone through a "bzr-git"
translation because otherwise the resulting branch may trigger a bug in
bzr when you later checkout a new copy of that branch (at least that
seems to be the problem we bumped into in the `elpa' branch).
"bzr join" has worked reliably for me as long as I didn't try to join
a repository converted by the bzr-git plugin. But I suspect that bzr-hg
might trigger the same problems.
> 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.
Indeed, the above leads to having two copies of the reftex files, so you
have to choose between the two and Bazaar won't know that they were really
the same files. So it's not necessarily the best solution, depending on
which history you want to keep and how important it is to preserve it
directly in the Emacs repository's metadata (as opposed to just as
a ChangeLog file or a commit log text).
Stefan
next prev parent reply other threads:[~2012-09-26 13:20 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-23 18:10 RefTeX Merge Ralf Angeli
2012-09-23 18:39 ` Paul Eggert
2012-09-24 6:13 ` Chong Yidong
2012-09-24 20:44 ` Ralf Angeli
2012-09-24 23:32 ` Richard Stallman
2012-09-25 6:30 ` Tassilo Horn
2012-09-26 6:11 ` Ralf Angeli
2012-09-26 7:09 ` Tassilo Horn
2012-09-26 7:59 ` Stephen J. Turnbull
2012-09-26 13:20 ` Stefan Monnier [this message]
2012-09-26 10:20 ` Chong Yidong
2012-09-26 13:24 ` Subdirectories in `lisp' Stefan Monnier
2012-09-30 20:46 ` RefTeX Merge Ralf Angeli
2012-09-23 18:48 ` Glenn Morris
2012-09-23 18:58 ` Glenn Morris
2012-09-23 19:09 ` Glenn Morris
2012-09-24 1:42 ` Glenn Morris
2012-09-24 1:50 ` Glenn Morris
2012-09-24 21:02 ` Ralf Angeli
2012-10-16 7:39 ` Tassilo Horn
2012-11-01 14:05 ` Ralf Angeli
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=jwva9wd2alq.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=angeli@caeruleus.net \
--cc=emacs-devel@gnu.org \
/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.