Merge lp://staging/~jelmer/bzr/log-ghosts into lp://staging/bzr

Proposed by Jelmer Vernooij
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: 5735
Proposed branch: lp://staging/~jelmer/bzr/log-ghosts
Merge into: lp://staging/bzr
Diff against target: 70 lines (+29/-2)
2 files modified
bzrlib/tests/blackbox/test_log.py (+27/-2)
bzrlib/tests/test_log.py (+2/-0)
To merge this branch: bzr merge lp://staging/~jelmer/bzr/log-ghosts
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+54490@code.staging.launchpad.net

Commit message

Add tests for using log on branches with ghosts in mainline.

Description of the change

This adds some tests for dealing with ghosts in mainline in "bzr log". It adds a knownfailure for bug #726466, which I was attempting to fix but which isn't as trivial as I had hoped.

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

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

On 3/23/2011 11:56 AM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr/log-ghosts into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> Bug #726466 in Bazaar: "bzr log fails on ghost revisions"
> https://bugs.launchpad.net/bzr/+bug/726466
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr/log-ghosts/+merge/54490
>
> This adds some tests for dealing with ghosts in mainline in "bzr log". It adds a knownfailure for bug #726466, which I was attempting to fix but which isn't as trivial as I had hoped.

 merge: approve

The tests look fine, shame it doesn't include other fixes :)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk2J2OUACgkQJdeBCYSNAANDrgCbBmvsVO0JEyP51O292EnUd0xE
gSQAnj++NW/EXQnzmHHRPKw6muZViGr/
=kE05
-----END PGP SIGNATURE-----

review: Approve
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

sent to pqm by email

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.