Merge lp:~jelmer/bzr/847435-diff-time into lp:bzr
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | John A Meinel |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6154 |
Proposed branch: | lp:~jelmer/bzr/847435-diff-time |
Merge into: | lp:bzr |
Diff against target: |
95 lines (+32/-2) 5 files modified
bzrlib/tests/per_tree/test_get_file_mtime.py (+9/-0) bzrlib/tests/per_workingtree/test_get_file_mtime.py (+13/-0) bzrlib/workingtree.py (+6/-1) bzrlib/workingtree_4.py (+1/-1) doc/en/release-notes/bzr-2.5.txt (+3/-0) |
To merge this branch: | bzr merge lp:~jelmer/bzr/847435-diff-time |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel | Approve | ||
Review via email:
|
Commit message
Raise NoSuchId from Tree.get_file_mtime if the file id was not found.
Description of the change
Test the Tree.get_file_mtime API to raise NoSuchId if an unknown file id is specified.
the working tree 4 basis tree implementations would return None rather than raising NoSuchId, which was inconsistent with the other tree implementations.
To post a comment you must log in.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 9/21/2011 2:49 AM, Jelmer Vernooij wrote: patch_date( ): /bugs.launchpad .net/bzr/ +bug/847435 /code.launchpad .net/~jelmer/ bzr/847435- diff-time/ +merge/ 76313
> Jelmer Vernooij has proposed merging
> lp:~jelmer/bzr/847435-diff-time into lp:bzr.
>
> Requested reviews: bzr-core (bzr-core) Related bugs: Bug #847435 in
> Bazaar: "bzr crashed with TypeError in format_
> unsupported operand type(s) for +: 'NoneType' and 'int'"
> https:/
>
> For more details, see:
> https:/
>
> Test the Tree.get_file_mtime API to raise NoSuchId if an unknown
> file id is specified.
>
> the working tree 4 basis tree implementations would return None
> rather than raising NoSuchId, which was inconsistent with the other
> tree implementations.
merge: approve
John
=:->
-----BEGIN PGP SIGNATURE----- enigmail. mozdev. org/
5wpUACgkQJdeBCY SNAAPP8ACeI63+ qGSFUjZuN7ao6Ky BJOCe lOa/b0sHlVeE9+ psD
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAk5
xUsAnioPJOLFmke
=ucm3
-----END PGP SIGNATURE-----