I can't merge the branch into trunk. I'm not sure what I've done wrong. I
tried each of pull, update, commit, merge, and push though I'm hazy on
which operation I tried in what order. Excepting the last two, merge and
push, which were done in the order listed.
{{{
Run command: bzr push
Connected (version 2.0, client Twisted)
Authentication (publickey) successful!
Secsh channel 1 opened.
Using saved push location: bzr+ssh://
bazaar.launchpad.net/~leo-editor-team/leo-editor/trunk3/
bzr: ERROR: Server sent an unexpected error: ('error',
'AppendRevisionsOnlyViolation', 'Operation denied because it would change
the main history, which is not permitted by the append_revisions_only
setting on branch
"chroot-84479760:///~leo-editor-team/leo-editor/trunk3/".')
}}}
On Sat, May 11, 2013 at 11:16 PM, Matt Wilkie <[email protected]> wrote:
> > Go ahead.
>
> ok, thanks.
>
>
> > The script will be a starting point. Not sure what I think
> > about .leos (Leo script) file extension: it's just a .py file.
>
> yeah, it's a .py file, but you can't use it unless you're inside Leo. I
> just wanted an easy way to tell the difference between a Leo script and
> regular python module without having to inspect it.
>
> -matt
>
> --
> https://code.launchpad.net/~maphew/leo-editor/pypi-packaging/+merge/163277
> You are the owner of lp:~maphew/leo-editor/pypi-packaging.
>
--
You received this message because you are subscribed to the Google Groups
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/leo-editor?hl=en-US.
For more options, visit https://groups.google.com/groups/opt_out.
