Bazaar

Merge lp://staging/~mbp/bzr/trivial-old into lp://staging/~bzr/bzr/trunk-old

  1. trivial-old
  2. Merge into trunk-old
Proposed by Martin Pool
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://staging/~mbp/bzr/trivial-old
Merge into: lp://staging/~bzr/bzr/trunk-old
Diff against target: 20 lines
To merge this branch: bzr merge lp://staging/~mbp/bzr/trivial-old
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+9740@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

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

Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/trivial into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>

 review approve
 merge approve

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

iEYEARECAAYFAkp60zkACgkQJdeBCYSNAAOZmQCgjrsU+fgcQFRNlO0ajG1AIHDu
4q4AnjpaOGaTo4L7NoFWQyrEInLH5H7y
=3gFk
-----END PGP SIGNATURE-----

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/tests/blackbox/test_bundle_info.py'
2--- bzrlib/tests/blackbox/test_bundle_info.py 2009-03-23 14:59:43 +0000
3+++ bzrlib/tests/blackbox/test_bundle_info.py 2009-08-06 05:35:09 +0000
4@@ -1,4 +1,4 @@
5-# Copyright (C) 2007 Canonical Ltd
6+# Copyright (C) 2007, 2009 Canonical Ltd
7 #
8 # This program is free software; you can redistribute it and/or modify
9 # it under the terms of the GNU General Public License as published by
10@@ -35,7 +35,9 @@
11 finally:
12 bundle.close()
13 info = self.run_bzr('bundle-info bundle')[0]
14- self.assertContainsRe(info, 'file: 1 .0 multiparent.')
15+ # there might be either one file, or two, depending on whether the
16+ # tree root counts...
17+ self.assertContainsRe(info, 'file: [12] .0 multiparent.')
18 self.assertContainsRe(info, 'nicks: source')
19 self.assertNotContainsRe(info, 'foo')
20 self.run_bzr_error(['--verbose requires a merge directive'],