Re: Workflow to accumulate individual changes?

["Óscar Fuentes" <ofv@wanadoo.es>]

Juanma Barranquero <lekktu@gmail.com> writes:

> On Wed, Dec 30, 2009 at 22:46, Óscar Fuentes <ofv@wanadoo.es> wrote:
>
>> *IF* they are small changes, i.e., the sort of things that you would do
>> on the quickfixes branch, *AND* if you didn't merge with trunk, this
>> should work keeping the history nice:
>>
>> <hack>
>> bzr commit
>> <hack>
>> bzr commit
>> ...
>> <when post-release arrives>:
>> bzr rebase
>> bzr push
>>
>> The resulting history on upstream will be linear, as if you committed
>> each change one by one on top of the previous one.
>
> If my post-23.2 branch is branched from my local trunk mirror, will
> "bzr push" push to it?

You can provide a location:

bzr rebase URL
bzr push URL

> Will that work when trunk is a bound branch?

I do not recommend using your local mirror for that.

> Or are you suggesting branching post-23.2 from
> bzr.savannah.gnu.org/srv/bzr/emacs/trunk?

No, you can branch from your local mirror if you wish (and why
not?). Remember that a branch is an autonomous identity that can
communicate with any other branch.

> Anyway, after thinking about the issue, I'm not sure it'd work,
> because of ChangeLog.

[snip]

> so it only really works for fixes that do not need ChangeLog entries.

Yup. This requires editing before sending upstream, so the most you can
do is to use a bzr branch as a patch depot.

Other option for having a patch depot is to use `bzr shelve', then when
you can commit unshelve each change separately, edit Changelog, commit
it... It seems as feature abuse to me, but it can be manageable if the
amount of changes is small and don't overlap.

-- 
Óscar