all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Bzr question about moving and renaming files
@ 2013-06-20 15:01 Stephen Berman
  2013-06-20 15:26 ` Glenn Morris
  2013-06-20 16:57 ` Eli Zaretskii
  0 siblings, 2 replies; 8+ messages in thread
From: Stephen Berman @ 2013-06-20 15:01 UTC (permalink / raw)
  To: emacs-devel

I'm getting close to committing my new version of todo-mode.el (except
for the Texinfo user manual, which will take more time), and want to try
and avoid any unpleasant mistake with bzr, which I'm not all that
experienced with.  I did a test run in my local branch, and had to use
two commits: first, rename calendar/todo-mode.el to
obsolete/otodo-mode.el, commit this, and then add the new version as
calendar/todo-mode.el and commit that.  I had tried adding the new
version before committing the rename, but vc-rename-file errored with
"Please update files before moving them".  Now, when I push my changes
to trunk at Savannah (via my local mirror, which is bound to it), 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.

Steve Berman



^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2013-06-20 21:07 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2013-06-20 20:17   ` Stephen Berman
2013-06-20 20:55     ` Eli Zaretskii

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.