# # # patch "tests/two_parent_workspace_inodeprint_from_birth/__driver__.lua" # from [91c35d3bc8db43af0cf1eeb1a3b67c66c0351eb2] # to [a9e6bc3f44cd5e115d22ab4c6616a50471bbb230] # ============================================================ --- tests/two_parent_workspace_inodeprint_from_birth/__driver__.lua 91c35d3bc8db43af0cf1eeb1a3b67c66c0351eb2 +++ tests/two_parent_workspace_inodeprint_from_birth/__driver__.lua a9e6bc3f44cd5e115d22ab4c6616a50471bbb230 @@ -55,8 +55,8 @@ check(qgrep("bar", "_MTN/inodeprints")) -- left and right are unchanged, but added in the other parent, so should be -- inodeprinted, except that left was added during the merge_into_workspace, --- so it's too new to be inodeprinted -check(not qgrep("left", "_MTN/inodeprints")) +-- so it might be too new to be inodeprinted (depending on the speed the +-- test happens to run), so we don't check for it. check(qgrep("right", "_MTN/inodeprints")) -- wait a bit, refresh, and check that left shows up now