tests/test-dirstatedirs.out

subrepo: correctly handle update -C with modified subrepos (issue2022)

(based on a patch by Saint Germain)

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