diff -r 110763cc3ab0 -r 3f4f14eab085 tests/test-rename.out --- a/tests/test-rename.out Sun May 17 16:25:48 2009 +0200 +++ b/tests/test-rename.out Tue May 19 03:59:58 2009 +0200 @@ -2,32 +2,32 @@ A d2/c d1/d11/a1 R d1/d11/a1 -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # rename --after a single file A d2/c d1/d11/a1 R d1/d11/a1 -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # move a single file to an existing directory A d2/a1 d1/d11/a1 R d1/d11/a1 -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # move --after a single file to an existing directory A d2/a1 d1/d11/a1 R d1/d11/a1 -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # rename a file using a relative path A d1/d11/e d2/b R d2/b -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # rename --after a file using a relative path A d1/d11/e d2/b R d2/b -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # rename directory d1 as d3 moving d1/a to d3/a moving d1/b to d3/b @@ -45,7 +45,7 @@ R d1/b R d1/ba R d1/d11/a1 -4 files updated, 0 files merged, 4 files removed, 0 files unresolved +4 files updated, 0 files merged, 0 files removed, 0 files unresolved # rename --after directory d1 as d3 moving d1/a to d3/a moving d1/b to d3/b @@ -63,25 +63,25 @@ R d1/b R d1/ba R d1/d11/a1 -4 files updated, 0 files merged, 4 files removed, 0 files unresolved +4 files updated, 0 files merged, 0 files removed, 0 files unresolved # move a directory using a relative path moving ../d1/d11/a1 to d3/d11/a1 A d2/d3/d11/a1 d1/d11/a1 R d1/d11/a1 -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # move --after a directory using a relative path moving ../d1/d11/a1 to d3/d11/a1 A d2/d3/d11/a1 d1/d11/a1 R d1/d11/a1 -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # move directory d1/d11 to an existing directory d2 (removes empty d1) moving d1/d11/a1 to d2/d11/a1 A d2/d11/a1 d1/d11/a1 R d1/d11/a1 -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # move directories d1 and d2 to a new directory d3 moving d1/a to d3/d1/a moving d1/b to d3/d1/b @@ -103,7 +103,7 @@ R d1/ba R d1/d11/a1 R d2/b -5 files updated, 0 files merged, 5 files removed, 0 files unresolved +5 files updated, 0 files merged, 0 files removed, 0 files unresolved # move --after directories d1 and d2 to a new directory d3 moving d1/a to d3/d1/a moving d1/b to d3/d1/b @@ -125,7 +125,7 @@ R d1/ba R d1/d11/a1 R d2/b -5 files updated, 0 files merged, 5 files removed, 0 files unresolved +5 files updated, 0 files merged, 0 files removed, 0 files unresolved # move everything under directory d1 to existing directory d2, do not # overwrite existing files (d2/b) d2/b: not overwriting - file exists @@ -143,7 +143,7 @@ < d1/b --- > d2/b -3 files updated, 0 files merged, 3 files removed, 0 files unresolved +3 files updated, 0 files merged, 0 files removed, 0 files unresolved # attempt to move one file into a non-existent directory abort: destination dx/ is not a directory 0 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -167,7 +167,7 @@ R d1/b R d1/ba R d1/d11/a1 -4 files updated, 0 files merged, 4 files removed, 0 files unresolved +4 files updated, 0 files merged, 0 files removed, 0 files unresolved # move --after some files under d1 to d2/d21 (glob) moving d1/a to d2/d21/a moving d1/d11/a1 to d2/d21/a1 @@ -177,7 +177,7 @@ d1/d11/a1 R d1/a R d1/d11/a1 -2 files updated, 0 files merged, 2 files removed, 0 files unresolved +2 files updated, 0 files merged, 0 files removed, 0 files unresolved # move every file under d1 starting with an 'a' to d2/d21 (regexp) moving d1/a to d2/d21/a moving d1/d11/a1 to d2/d21/a1 @@ -187,7 +187,7 @@ d1/d11/a1 R d1/a R d1/d11/a1 -2 files updated, 0 files merged, 2 files removed, 0 files unresolved +2 files updated, 0 files merged, 0 files removed, 0 files unresolved # attempt to overwrite an existing file d1/ca: not overwriting - file exists ? d1/ca @@ -196,12 +196,12 @@ A d1/ca d1/ba R d1/ba -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # replace a symlink with a file A d1/ca d1/ba R d1/ba -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # do not copy more than one source file to the same destination file moving d1/d11/a1 to d3/d11/a1 d3/b: not overwriting - d2/b collides with d1/b @@ -217,7 +217,7 @@ R d1/b R d1/ba R d1/d11/a1 -4 files updated, 0 files merged, 4 files removed, 0 files unresolved +4 files updated, 0 files merged, 0 files removed, 0 files unresolved # move a whole subtree with "hg rename ." moving a to ../d3/d1/a moving b to ../d3/d1/b @@ -235,7 +235,7 @@ R d1/b R d1/ba R d1/d11/a1 -4 files updated, 0 files merged, 4 files removed, 0 files unresolved +4 files updated, 0 files merged, 0 files removed, 0 files unresolved # move a whole subtree with "hg rename --after ." moving a to ../d3/a moving b to ../d3/b @@ -253,7 +253,7 @@ R d1/b R d1/ba R d1/d11/a1 -4 files updated, 0 files merged, 4 files removed, 0 files unresolved +4 files updated, 0 files merged, 0 files removed, 0 files unresolved # move the parent tree with "hg rename .." moving ../a to ../../d3/a moving ../b to ../../d3/b @@ -271,7 +271,7 @@ R d1/b R d1/ba R d1/d11/a1 -4 files updated, 0 files merged, 4 files removed, 0 files unresolved +4 files updated, 0 files merged, 0 files removed, 0 files unresolved # skip removed files moving d1/a to d3/a moving d1/ba to d3/ba @@ -286,17 +286,17 @@ R d1/b R d1/ba R d1/d11/a1 -4 files updated, 0 files merged, 3 files removed, 0 files unresolved +4 files updated, 0 files merged, 0 files removed, 0 files unresolved # transitive rename A d1/bc d1/b R d1/b -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # transitive rename --after A d1/bc d1/b R d1/b -1 files updated, 0 files merged, 1 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved # idempotent renames (d1/b -> d1/bb followed by d1/bb -> d1/b) M d1/b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved