all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Stephen Berman <stephen.berman@gmx.net>
Cc: emacs-devel@gnu.org
Subject: Re: Bzr question about moving and renaming files
Date: Thu, 20 Jun 2013 19:57:34 +0300	[thread overview]
Message-ID: <834ncspvnl.fsf@gnu.org> (raw)
In-Reply-To: <87wqpohln3.fsf@rosalinde.fritz.box>

> From: Stephen Berman <stephen.berman@gmx.net>
> Date: Thu, 20 Jun 2013 17:01:04 +0200
> 
> Now, when I push my changes to trunk at Savannah (via my local
> mirror, which is bound to it)

If your local mirror is bound to Savannah, then how did you commit
your changes?  Did you use "bzr ci --local"?  If not, your commits are
already on Savannah, because committing in a bound branch pushes the
changes to the master repository.

> do I have to replicate this two-step procedure, or can I just do one
> bzr commit (or rather `C-c C-c' from the VC log buffer) and that
> will install the new version in calendar/, overwriting the old
> version, and install the renamed old version in obsolete/?  I'm
> guessing I have to do it in two commits, but I'd appreciate
> confirmation, or, if it is possible to do it in one commit, a recipe
> for how to do it.

One commit should be all you need.  It will reproduce on Savannah the
entire history you have locally, including the rename.



  parent reply	other threads:[~2013-06-20 16:57 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-20 15:01 Bzr question about moving and renaming files Stephen Berman
2013-06-20 15:26 ` Glenn Morris
2013-06-20 20:17   ` Stephen Berman
2013-06-20 20:51     ` Stefan Monnier
2013-06-20 21:07       ` Stephen Berman
2013-06-20 16:57 ` Eli Zaretskii [this message]
2013-06-20 20:17   ` Stephen Berman
2013-06-20 20:55     ` Eli Zaretskii

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=834ncspvnl.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=stephen.berman@gmx.net \
    /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.