"bzr push" to a bound branch without a working tree

[Neil Martinsen-Burrell]

On Wed, May 18, 2011 at 15:45, Eli Zaretskii <eliz at gnu.org> wrote:
>> Date: Wed, 18 May 2011 13:11:53 -0500
>> From: Neil Martinsen-Burrell <nmb at wartburg.edu>
>>
>> On Wed, May 18, 2011 at 13:09, Neil Martinsen-Burrell <nmb at wartburg.edu> wrote:
>> [...]
>> > I haven't tried with the "emacs" branch on a separate server, but it
>> > is possible that the problem lies there.
>>
>> That isn't the problem.  I can't reproduce the lock contention even
>> with the "emacs" branch on a separate machine.
>
> Could it be that you use a newer version of bzr?  I use 2.3.1.

I can't reproduce the problem using the steps I gave in version 2.3.1.
 Can you reproduce the problem every time?  Are there any new
revisions on trunk that aren't in quickfixes?  Is trunk up to date
with the emacs branch on the server? I suggest that you file the bug
so it can be tracked and discussed in that context.

If you what you really want is to use "bzr merge" in the trunk branch,
then you need to make a working tree there.  The conceptual reason
(agreed it is undocumented) that a merge cannot be done without a
working tree is that Bazaar's merge command only stages the merge to a
working tree (and records the parent), it does not commit it.  The
idea is that all merges ought to be tested in a working tree, even
those that apply cleanly.  On the other hand, for revisions that are
direct descendants of the current tip, then push or pull can be used
to update a branch to the state of another.

-Neil