bzr-grep

Merge lp://qastaging/~jelmer/bzr-grep/feature-move into lp://qastaging/bzr-grep

  1. feature-move
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Martin Pool
Approved revision: 145
Merged at revision: 146
Proposed branch: lp://qastaging/~jelmer/bzr-grep/feature-move
Merge into: lp://qastaging/bzr-grep
Diff against target: 18 lines (+5/-1)
1 file modified
features.py (+5/-1)
To merge this branch: bzr merge lp://qastaging/~jelmer/bzr-grep/feature-move
Reviewer Review Type Date Requested Status
Bazaar Developers Pending
Review via email: mp+71588@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2011-08-15.

Description of the change

Cope with the fact that Feature has moved to bzrlib.tests.features in bzr.dev.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote : Posted in a previous version of this proposal

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 8/15/2011 7:04 PM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-grep/lazy into
> lp:bzr-grep.
>
> Requested reviews: Bazaar Developers (bzr)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-grep/lazy/+merge/71587
>
> Cope with the fact that Feature has moved to bzrlib.tests.features in
> bzr.dev.

 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk5KbJEACgkQJdeBCYSNAANewQCdF20d77YOLF4XxK97Q1HF6jvJ
0xAAnR4wTWkME57CR+jVZEV67fzeoZJt
=5IA0
-----END PGP SIGNATURE-----

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches