From: Chong Yidong <cyd@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Moving Emacs 24.3 development to emacs-24 branch soon
Date: Thu, 01 Nov 2012 21:58:35 +0800 [thread overview]
Message-ID: <874nl95ss4.fsf@gnu.org> (raw)
In-Reply-To: <83d2zx77ub.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 01 Nov 2012 15:47:56 +0200")
Eli Zaretskii <eliz@gnu.org> writes:
>> bzr push bzr+ssh://NAME@bzr.savannah.gnu.org/emacs/emacs-24
>> This pushes the contents of `trunk' into `emacs-24'.
>
> I don't think you can do that. "push" is only possible from a branch
> that didn't diverge from the target. You should "merge" (from trunk
> to emacs-24) instead, and then commit.
>
> However, merging will probably mess up the history in a way that will
> make forensics difficult. So I agree with Andreas and Dani who
> proposed a separate branch instead.
As Stefan pointed out to me in a separate email, pushing will work, one
just has to set the bzr configuration variable append_revisions_only to
False. The bzr tag doesn't seem to be discarded by the push, either; it
is still possible to check it out with -r TAGNAME afterward.
next prev parent reply other threads:[~2012-11-01 13:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-01 2:12 Moving Emacs 24.3 development to emacs-24 branch soon Chong Yidong
2012-11-01 6:57 ` Andreas Schwab
2012-11-01 9:30 ` Dani Moncayo
2012-11-01 13:04 ` Stefan Monnier
2012-11-01 10:09 ` Chong Yidong
2012-11-01 10:39 ` Dani Moncayo
2012-11-01 13:18 ` Andreas Schwab
2012-11-01 13:47 ` Eli Zaretskii
2012-11-01 13:58 ` Chong Yidong [this message]
2012-11-01 14:05 ` Andreas Schwab
2012-11-01 16:32 ` Stephen J. Turnbull
2012-11-01 17:22 ` Stefan Monnier
2012-11-03 12:28 ` Stephen J. Turnbull
2012-11-04 17:28 ` Eli Zaretskii
2012-11-04 17:39 ` Juanma Barranquero
2012-11-05 10:39 ` Stephen J. Turnbull
2012-11-01 16:42 ` Glenn Morris
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=874nl95ss4.fsf@gnu.org \
--to=cyd@gnu.org \
--cc=eliz@gnu.org \
--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.