[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Bzr question about moving and renaming files
From: |
Stephen Berman |
Subject: |
Re: Bzr question about moving and renaming files |
Date: |
Thu, 20 Jun 2013 22:17:38 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
On Thu, 20 Jun 2013 19:57:34 +0300 Eli Zaretskii <address@hidden> wrote:
>> From: Stephen Berman <address@hidden>
>> 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.
I wasn't saying I already pushed the changes but asking what I should do
when I push them. My test run was on a non-bound branch.
>> 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.
Yes, that's what Glenn's test also showed, but it doesn't seem to work
using VC, see my followup to him.
Steve Berman