tests/test-dirstatedirs.out

patch: try harder to find the file to patch on file creation (issue2041)

accept the following patch header:
first line:  foo/a.orig
second line: foo/a

adding a/b/c/d/x
adding a/b/c/d/y
adding a/b/c/d/z
moving a/b/c/d/x to z/b/c/d/x
moving a/b/c/d/y to z/b/c/d/y
moving a/b/c/d/z to z/b/c/d/z