From: "Stephen J. Turnbull" <stephen@xemacs.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: keramida@ceid.upatras.gr, acm@muc.de, emacs-devel@gnu.org
Subject: Re: Help me unstick my bzr, please.
Date: Sun, 17 Jan 2010 15:04:32 +0900 [thread overview]
Message-ID: <878wbxtggf.fsf@uwakimon.sk.tsukuba.ac.jp> (raw)
In-Reply-To: <83eilqctne.fsf@gnu.org>
Eli Zaretskii writes:
> Sorry, I don't understand what you mean by ``appear to be mainline''
> and by ``commits [...] to be a feature branch''. Can you elaborate?
I suspect the approach you propose will have the following appearance
in bzr log:
$ bzr log
2 acm made a small change to CC mode
1 rms made a small change to RMail
$ bzr log -n0
2 acm made a small change to CC mode
1.3 eli made a small change to the MSDOS Makefile.in
1.2 cyd released Emacs 23.2
1.1 dak added a node to Info
1 rms made a small change to RMail
$
Very likely to happen in acm's mirror branch, and I believe that this
would propagate to the main repository when he pushes. It is
*definitely possible* for this to happen. Whether or not it *will*
happen depends on exactly what the state of acm's branch is and how he
goes about fixing it up, merging to trunk, and pushing to Savannah.
If it happens and gets pushed, it is repairable, of course, but only
at the cost of rebasing a published branch.
next prev parent reply other threads:[~2010-01-17 6:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-15 22:27 Help me unstick my bzr, please Alan Mackenzie
2010-01-16 2:37 ` Giorgos Keramidas
2010-01-16 7:48 ` Eli Zaretskii
2010-01-16 8:29 ` Stephen J. Turnbull
2010-01-16 8:41 ` Stephen J. Turnbull
2010-01-16 8:59 ` Eli Zaretskii
2010-01-17 6:04 ` Stephen J. Turnbull [this message]
2010-01-16 9:02 ` Giorgos Keramidas
2010-01-16 9:57 ` Eli Zaretskii
2010-01-16 10:04 ` Giorgos Keramidas
2010-01-16 9:16 ` Lennart Borgman
2010-01-16 9:53 ` Andreas Schwab
2010-01-16 9:54 ` Eli Zaretskii
2010-01-16 9:59 ` Giorgos Keramidas
2010-01-16 10:02 ` Lennart Borgman
2010-01-16 11:17 ` Eli Zaretskii
2010-01-17 6:23 ` Simple unsticking with 'bzr shelve' [was: Help me unstick ...] Stephen J. Turnbull
2010-01-16 19:36 ` Help me unstick my bzr, please Stefan Monnier
2010-01-16 21:38 ` Alan Mackenzie
2010-01-17 7:50 ` Giorgos Keramidas
2010-01-16 10:10 ` Eli Zaretskii
2010-01-16 21:27 ` Alan Mackenzie
2010-01-16 21:32 ` Juanma Barranquero
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878wbxtggf.fsf@uwakimon.sk.tsukuba.ac.jp \
--to=stephen@xemacs.org \
--cc=acm@muc.de \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=keramida@ceid.upatras.gr \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).