Merge lp:~jelmer/brz/fix-walkdirs-thingy into lp:brz

Proposed by Jelmer Vernooij on 2018-09-15
Status: Merged
Approved by: Jelmer Vernooij on 2018-09-15
Approved revision: 7117
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/fix-walkdirs-thingy
Merge into: lp:brz
Diff against target: 12 lines (+1/-1)
1 file modified
breezy/tests/per_tree/test_walkdirs.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/fix-walkdirs-thingy
Reviewer Review Type Date Requested Status
Martin Packman 2018-09-15 Approve on 2018-09-15
Review via email: mp+354990@code.launchpad.net

Commit message

Fix sort order for walkdir items.

Description of the change

Fix sort order for items.

To post a comment you must log in.
Martin Packman (gz) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/tests/per_tree/test_walkdirs.py'
2--- breezy/tests/per_tree/test_walkdirs.py 2018-09-14 16:51:15 +0000
3+++ breezy/tests/per_tree/test_walkdirs.py 2018-09-15 18:17:23 +0000
4@@ -55,7 +55,7 @@
5 ('symlink', 'symlink', 'symlink', None,
6 tree.path2id('symlink'), 'symlink'))
7 return [((path, tree.path2id(path)), list(sorted(entries)))
8- for (path, entries) in dirblocks.items()]
9+ for (path, entries) in sorted(dirblocks.items())]
10
11 def test_walkdir_root(self):
12 tree = self.get_tree_with_subdirs_and_all_supported_content_types(

Subscribers

People subscribed via source and target branches