Trouble in leo-4-6 branch: please hold commits to trunk

[Edward K. Ream]

As noted in another branch, there are major problems with the leo-4-6
branch. I'll probably abandon the branch.

The recent trunk is likely to be the base of a new leo-4-6-final
branch, so please hold all commits to the trunk for a little while.
Thanks.

Edward

[Edward K. Ream]

The leo-4-6-final branch has been created.

The trunk is now open for development as usual.

Edward

P.S. I'll probably open a branch (based on the 4-6-final branch) to
attempt a fix for an rst bug. That will likely be the last change to
Leo 4.6 final.

EKR

[Ville M. Vainio]

On Sun, Jul 12, 2009 at 9:06 PM, Edward K. Ream<edre...@gmail.com> wrote:

> P.S.  I'll probably open a branch (based on the 4-6-final branch) to
> attempt a fix for an rst bug.  That will likely be the last change to
> Leo 4.6 final.

Note that you don't need to necessarily create the branch on launchpad
to do little fixes, local branch you created with "bzr branch" is a
full-blown branch in its own right anyway.

Here's how I do all my commits to trunk:

I have ~/leotrunk. I always keep this up to date with "bzr pull", but
never develop here.

I have ~/leo-editor, also created from trunk. I develop here normally.
Occasionally, I just "bzr push", but often it fails because "branches
have diverged". I resist the temptation to "bzr merge" here, because
it screws up history. Rather, I:

- cd ~/leotrunk
- bzr pull (this always succeeds)
- bzr merge ~/leo-editor
- (investigate diffs)
- bzr qcommit (and only select the files I really want to commit -
usually .py files)
- bzr push

Then, to get my ~/leo-editor up to date again:

cd ~/leo-editor
bzr pull

--
Ville M. Vainio
http://tinyurl.com/vainio

[Edward K. Ream]

On Sun, Jul 12, 2009 at 1:16 PM, Ville M. Vainio <viva...@gmail.com> wrote:

Here's how I do all my commits to trunk:

Thanks for this.  I'll give it  careful thought.

Where did the qbzr set of command come from?  Are they new?

Edward

[Ville M. Vainio]

On Sun, Jul 12, 2009 at 9:34 PM, Edward K. Ream<edre...@gmail.com> wrote:

> Thanks for this.  I'll give it  careful thought.
>
> Where did the qbzr set of command come from?  Are they new?

No, they are added by installing qbzr (unless I completely missed your
question ;-).

[Edward K. Ream]

On Sun, Jul 12, 2009 at 1:41 PM, Ville M. Vainio <viva...@gmail.com> wrote:

> Where did the qbzr set of command come from?  Are they new?

No, they are added by installing qbzr (unless I completely missed your
question ;-).

They exist on my Windows installation, and I don't remember ever installing qbzr separately, so I think maybe they are installed by default on Windows.  It seems strange that such a useful set of tools aren't mentioned more prominently on the bzr site.

Edward

[zpcspm]

On Jul 13, 12:12 am, "Edward K. Ream" <edream...@gmail.com> wrote:
> They exist on my Windows installation, and I don't remember ever installing
> qbzr separately, so I think maybe they are installed by default on Windows.

I believe you are correct, since on my Linux I had to build and
install qbzr as separate package.

> It seems strange that such a useful set of tools aren't mentioned more
> prominently on the bzr site.

qbzr is a bzr plugin. It's on the plugins page http://bazaar-vcs.org/BzrPlugins.
Scroll down to "GUI (Graphical User Interfaces for Bazaar)", it's
there.

[Edward K. Ream]

On Jul 13, 5:24 am, zpcspm <zpc...@gmail.com> wrote:

> qbzr is a bzr plugin. It's on the plugins pagehttp://bazaar-vcs.org/BzrPlugins.

> Scroll down to "GUI (Graphical User Interfaces for Bazaar)", it's
> there.

Thanks for clearing up this mystery.

Edward

[zpcspm]

Went through it myself some time ago .
I was used with GUI frontends to version control managers to be
distinct apps and I've had some hard time figuring out why after
installing qbzr, typing "qbzr" in the command line gives "command not
found" :-)