From: David Reitter <david.reitter@gmail.com>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: Emacs-Devel devel <emacs-devel@gnu.org>
Subject: Re: bzr - how to switch to Emacs 23 branch?
Date: Sun, 12 Sep 2010 15:22:54 -0400 [thread overview]
Message-ID: <2D1865CD-D7B4-4D26-95BB-CBD819BA80F4@gmail.com> (raw)
In-Reply-To: <87eiczd9n7.fsf@telefonica.net>
On Sep 11, 2010, at 9:37 PM, Óscar Fuentes wrote:
>
> bzr branch sftp://USERNAME@bzr.savannah.gnu.org/srv/bzr/emacs/emacs-23 emacs-23
Thanks, this worked. I thought it had the reference for the branch locally.
It still took a few minutes to complete, though!
> Bad news: bzr is not git. You need to retrain your dVCS-fu to work with
> bzr. Practising some yoga will help too.
I agree. The whole pull-does-not-merge, and merge-does-not-commit thing is of course a bit confusing for a Gitster. (These aren't bad features I think - they are just different.)
After my change (done on the branch directly), I had to merge/commit from the remote before I could push. This created an extra merge commit, and I thought that that wouldn't be clean. So I "uncommitted" everything to the state before my change, merged/committed, and then applied my change again. Is this the right way? is there an easier way? Or do all these spurious merges not matter in terms of public history?
prev parent reply other threads:[~2010-09-12 19:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-12 0:26 bzr - how to switch to Emacs 23 branch? David Reitter
2010-09-12 1:37 ` Óscar Fuentes
2010-09-12 19:22 ` David Reitter [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
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=2D1865CD-D7B4-4D26-95BB-CBD819BA80F4@gmail.com \
--to=david.reitter@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=ofv@wanadoo.es \
/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).