Re: Help me unstick my bzr, please.

[Juanma Barranquero]

On Sat, Jan 16, 2010 at 22:27, Alan Mackenzie <address@hidden> wrote:

> My mistake was I tried to move my changes from "quickfixes" to "trunk"
> using "bzr merge".  'bzr help merge' doesn't say what is merged with what
> where, sadly.

You said:

> I attempt to merge the change into my "trunk" branch by doing this:
>
>   ~/emacs/emacs.bzr/quickfixes$ bzr merge

which is the wrong way. If you want to merge changes *from* a branch
*into* trunk, you should do

  cd trunk
  bzr update                # to make sure trunk is up to date
  bzr merge ../quickfixes   # or the task branch, etc.

> I think what I really want is 'bzr push'.  Is this correct?

No.

> The documentation for 'bzr push' is not helpful.

Sadly true.

    Juanma