Skip to content
Snippets Groups Projects
Commit fc719967 authored by Raphaël Gomès's avatar Raphaël Gomès
Browse files

dirstate-v2: fix edge case where entries aren't sorted

See previous commit for more details.
parent e255a535
No related branches found
No related tags found
2 merge requests!300branching: merge stable into default,!269dirstate-v2: highlight a bug when Python-packed but used in `rhg`
......@@ -272,7 +272,7 @@
)
return data, tree_metadata
sorted_map = sorted(map.items(), key=lambda x: x[0])
sorted_map = sorted(map.items(), key=lambda x: x[0].split(b"/"))
# Use a stack to have to only remember the nodes we currently need
# instead of building the entire tree in memory
......
......@@ -257,5 +257,4 @@
$ touch src/dirstate/file1 src/dirstate/file2 src/dirstate.rs
$ touch file1 file2
$ hg commit -Aqm1
#if rhg no-rust dirstate-v2
$ hg st
......@@ -261,11 +260,2 @@
$ hg st
! src/dirstate/file1 (known-bad-output !)
! src/dirstate/file2 (known-bad-output !)
? src/dirstate/file1 (known-bad-output !)
? src/dirstate/file2 (known-bad-output !)
expected a value, found none (known-bad-output !)
[255]
#else
$ hg st
#endif
$ cd ..
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment