view tests/test-rename-dir-merge.out @ 4403:15289406f89c

mq: account for readheaders munging in qrefresh

adding a/a
adding a/b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
copying a/a to b/a
copying a/b to b/b
removing a/a
removing a/b
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
resolving manifests
 overwrite None partial False
 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
 a/c: remote renamed directory to b/c -> d
 a/a: remote moved to b/a -> m
 a/b: remote moved to b/b -> m
copying a/a to b/a
removing a/a
copying a/b to b/b
removing a/b
moving a/c to b/c
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
a/* b/a b/b b/c
M b/a
  a/a
M b/b
  a/b
A b/c
  a/c
R a/a
R a/b
R a/c
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
resolving manifests
 overwrite None partial False
 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
 b/a: local moved to a/a -> m
 b/b: local moved to a/b -> m
 None: local renamed directory to b/c -> d
getting a/c to b/c
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
a/* b/a b/b b/c
M b/a
  a/a
M b/b
  a/b
A b/c
  a/c