Show More
@@ -272,7 +272,7 b' def pack_dirstate(map, copy_map):' | |||||
272 | ) |
|
272 | ) | |
273 | return data, tree_metadata |
|
273 | return data, tree_metadata | |
274 |
|
274 | |||
275 | sorted_map = sorted(map.items(), key=lambda x: x[0]) |
|
275 | sorted_map = sorted(map.items(), key=lambda x: x[0].split(b"/")) | |
276 |
|
276 | |||
277 | # Use a stack to have to only remember the nodes we currently need |
|
277 | # Use a stack to have to only remember the nodes we currently need | |
278 | # instead of building the entire tree in memory |
|
278 | # instead of building the entire tree in memory |
@@ -257,15 +257,5 b' Check dirstate ordering' | |||||
257 | $ touch src/dirstate/file1 src/dirstate/file2 src/dirstate.rs |
|
257 | $ touch src/dirstate/file1 src/dirstate/file2 src/dirstate.rs | |
258 | $ touch file1 file2 |
|
258 | $ touch file1 file2 | |
259 | $ hg commit -Aqm1 |
|
259 | $ hg commit -Aqm1 | |
260 | #if rhg no-rust dirstate-v2 |
|
|||
261 | $ hg st |
|
260 | $ hg st | |
262 | ! src/dirstate/file1 (known-bad-output !) |
|
|||
263 | ! src/dirstate/file2 (known-bad-output !) |
|
|||
264 | ? src/dirstate/file1 (known-bad-output !) |
|
|||
265 | ? src/dirstate/file2 (known-bad-output !) |
|
|||
266 | expected a value, found none (known-bad-output !) |
|
|||
267 | [255] |
|
|||
268 | #else |
|
|||
269 | $ hg st |
|
|||
270 | #endif |
|
|||
271 | $ cd .. |
|
261 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now