view tests/test-rename-dir-merge.out @ 11848:f54ff49393fb

tests: unify test-abort-checkin

adding a/a
adding a/b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
moving a/a to b/a
moving a/b to b/b
2 files updated, 0 files merged, 2 files removed, 0 files unresolved
created new head
  searching for copies back to rev 1
  unmatched files in local:
   a/c
   a/d
  unmatched files in other:
   b/a
   b/b
  all copies found (* = to merge, ! = divergent):
   b/a -> a/a 
   b/b -> a/b 
  checking for directory renames
  dir a/ -> b/
  file a/c -> b/c
  file a/d -> b/d
resolving manifests
 overwrite None partial False
 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 397f8b00a740
 a/d: remote renamed directory to b/d -> d
 a/c: remote renamed directory to b/c -> d
 a/b: other deleted -> r
 a/a: other deleted -> r
 b/a: remote created -> g
 b/b: remote created -> g
updating: a/a 1/6 files (16.67%)
removing a/a
updating: a/b 2/6 files (33.33%)
removing a/b
updating: a/c 3/6 files (50.00%)
moving a/c to b/c
updating: a/d 4/6 files (66.67%)
moving a/d to b/d
updating: b/a 5/6 files (83.33%)
getting b/a
updating: b/b 6/6 files (100.00%)
getting b/b
4 files updated, 0 files merged, 2 files removed, 0 files unresolved
(branch merge, don't forget to commit)
a/* b/a b/b b/c b/d
M b/a
M b/b
A b/c
  a/c
R a/a
R a/b
R a/c
? b/d
b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
  searching for copies back to rev 1
  unmatched files in local:
   b/a
   b/b
   b/d
  unmatched files in other:
   a/c
  all copies found (* = to merge, ! = divergent):
   b/a -> a/a 
   b/b -> a/b 
  checking for directory renames
  dir a/ -> b/
  file a/c -> b/c
resolving manifests
 overwrite None partial False
 ancestor f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb
 None: local renamed directory to b/c -> d
updating:None 1/1 files (100.00%)
getting a/c to b/c
1 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 b/d
A b/c
  a/c
? b/d
created new head
b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88