bzr-colo

Merge lp://qastaging/~spundun/bzr-colo/fixes into lp://qastaging/bzr-colo

fixes
Merge into trunk

Proposed by Spundun on 2013-04-25

Status:	Merged
Merged at revision:	121
Proposed branch:	lp://qastaging/~spundun/bzr-colo/fixes
Merge into:	lp://qastaging/bzr-colo
Diff against target:	39 lines (+2/-5) 3 files modified INSTALL.txt (+1/-1) commands.py (+0/-3) info.py (+1/-1)
To merge this branch:	bzr merge lp://qastaging/~spundun/bzr-colo/fixes
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Neil Martinsen-Burrell	2013-04-25	Approve on 2013-07-17
Alexander Belchenko (community)		Approve on 2013-07-10
Review via email: mp+161034@code.qastaging.launchpad.net

Description of the change

bzr-colo is broken on bzr 2.1.4, fixing documentation and code.

Please review the patch before merging.

Revision history for this message

Neil Martinsen-Burrell (nmb) wrote on 2013-04-29:

The patch is empty. I don't see any new revisions on that branch. Have
you perhaps committed them locally and now need to "bzr push" them to
Launchpad?

On Thu, Apr 25, 2013 at 5:30 PM, Spundun <email address hidden> wrote:

> Spundun has proposed merging lp:~spundun/bzr-colo/fixes into lp:bzr-colo.
>
> Requested reviews:
> Neil Martinsen-Burrell (nmb)
>
> For more details, see:
> https://code.launchpad.net/~spundun/bzr-colo/fixes/+merge/161034
>
> bzr-colo is broken on bzr 2.1.4, fixing documentation and code.
>
> Please review the patch before merging.
> --
> https://code.launchpad.net/~spundun/bzr-colo/fixes/+merge/161034
> You are requested to review the proposed merge of
> lp:~spundun/bzr-colo/fixes into lp:bzr-colo.
>
>
>

lp://qastaging/~spundun/bzr-colo/fixes updated on 2013-04-29

121. By Spundun on 2013-04-29

With bzr 2.1.4 I get the following error
The BranchHooks hook 'post_branch_init' is unknown in this version of bzrlib.
Unable to load plugin 'colo' from '/nfs/div1/spundun/.bazaar/plugins'
bzr: ERROR: unknown command "branches"

According to bzr API, post_branch_init was introduced in 2.2, so upping the
version requirements.

Revision history for this message

Spundun (spundun) wrote on 2013-04-29:

hi,

Turns out that I deleted my changes locally since I thought they were
already in the repo. You are right, I think I forgot to push the commit. I
made the patch again, let me know if this works now.

Thanks
Spundun

On Sun, Apr 28, 2013 at 6:37 PM, Neil Martinsen-Burrell <
<email address hidden>> wrote:

> The patch is empty. I don't see any new revisions on that branch. Have
> you perhaps committed them locally and now need to "bzr push" them to
> Launchpad?
>
>
> On Thu, Apr 25, 2013 at 5:30 PM, Spundun <email address hidden> wrote:
>
> > Spundun has proposed merging lp:~spundun/bzr-colo/fixes into lp:bzr-colo.
> >
> > Requested reviews:
> > Neil Martinsen-Burrell (nmb)
> >
> > For more details, see:
> > https://code.launchpad.net/~spundun/bzr-colo/fixes/+merge/161034
> >
> > bzr-colo is broken on bzr 2.1.4, fixing documentation and code.
> >
> > Please review the patch before merging.
> > --
> > https://code.launchpad.net/~spundun/bzr-colo/fixes/+merge/161034
> > You are requested to review the proposed merge of
> > lp:~spundun/bzr-colo/fixes into lp:bzr-colo.
> >
> >
> >
>
> --
> https://code.launchpad.net/~spundun/bzr-colo/fixes/+merge/161034
> You are the owner of lp:~spundun/bzr-colo/fixes.
>

Revision history for this message

Spundun (spundun) wrote on 2013-04-29:

Looks like you're right. I will check again when I get home.

On Sunday, April 28, 2013, Neil Martinsen-Burrell wrote:

> The patch is empty. I don't see any new revisions on that branch. Have
> you perhaps committed them locally and now need to "bzr push" them to
> Launchpad?
>
>
> On Thu, Apr 25, 2013 at 5:30 PM, Spundun <<email address hidden> <javascript:;>>
> wrote:
>
> > Spundun has proposed merging lp:~spundun/bzr-colo/fixes into lp:bzr-colo.
> >
> > Requested reviews:
> > Neil Martinsen-Burrell (nmb)
> >
> > For more details, see:
> > https://code.launchpad.net/~spundun/bzr-colo/fixes/+merge/161034
> >
> > bzr-colo is broken on bzr 2.1.4, fixing documentation and code.
> >
> > Please review the patch before merging.
> > --
> > https://code.launchpad.net/~spundun/bzr-colo/fixes/+merge/161034
> > You are requested to review the proposed merge of
> > lp:~spundun/bzr-colo/fixes into lp:bzr-colo.
> >
> >
> >
>
> --
> https://code.launchpad.net/~spundun/bzr-colo/fixes/+merge/161034
> You are the owner of lp:~spundun/bzr-colo/fixes.
>