Mercurial > hg
diff tests/test-rename.out @ 2175:b2ae81a7df29
Make hg update more verbose by default (issue12)
(including small changes to revert and backout to not show these stats
with the exception of backout --merge)
Show update stats (unless -q), e.g.:
K files updated, L files merged, M files removed, N files unresolved
Inform the user what to do after a merge:
(branch merge, don't forget to commit)
Inform the user what to do if a branch merge failed:
There are unresolved merges, you can redo the full merge using:
hg update -C X
hg merge Y
Inform the user what to do if a working directory merge failed:
There are unresolved merges with locally modified files.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 02 May 2006 18:44:02 +0200 |
parents | df8416346bb7 |
children | 36abb07c79d4 |
line wrap: on
line diff
--- a/tests/test-rename.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-rename.out Tue May 02 18:44:02 2006 +0200 @@ -1,21 +1,27 @@ # rename a single file A d2/c R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # rename --after a single file A d2/c R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # move a single file to an existing directory A d2/a1 R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # move --after a single file to an existing directory A d2/a1 R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # rename a file using a relative path A d1/d11/e R d2/b +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # rename --after a file using a relative path A d1/d11/e R d2/b +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # rename directory d1 as d3 copying d1/a to d3/a copying d1/b to d3/b @@ -33,6 +39,7 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # rename --after directory d1 as d3 copying d1/a to d3/a copying d1/b to d3/b @@ -50,21 +57,25 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # move a directory using a relative path copying ../d1/d11/a1 to d3/d11/a1 removing ../d1/d11/a1 A d2/d3/d11/a1 R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # move --after a directory using a relative path copying ../d1/d11/a1 to d3/d11/a1 removing ../d1/d11/a1 A d2/d3/d11/a1 R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # move directory d1/d11 to an existing directory d2 (removes empty d1) copying d1/d11/a1 to d2/d11/a1 removing d1/d11/a1 A d2/d11/a1 R d1/d11/a1 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # move directories d1 and d2 to a new directory d3 copying d1/a to d3/d1/a copying d1/b to d3/d1/b @@ -86,6 +97,7 @@ R d1/ba R d1/d11/a1 R d2/b +5 files updated, 0 files merged, 5 files removed, 0 files unresolved # move --after directories d1 and d2 to a new directory d3 copying d1/a to d3/d1/a copying d1/b to d3/d1/b @@ -107,6 +119,7 @@ R d1/ba R d1/d11/a1 R d2/b +5 files updated, 0 files merged, 5 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 @@ -122,6 +135,7 @@ < d1/b --- > d2/b +3 files updated, 0 files merged, 3 files removed, 0 files unresolved # attempt to move potentially more than one file into a non-existent # directory abort: with multiple sources, destination must be an existing directory @@ -142,6 +156,7 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # move --after some files under d1 to d2/d21 (glob) copying d1/a to d2/d21/a copying d1/d11/a1 to d2/d21/a1 @@ -151,6 +166,7 @@ A d2/d21/a1 R d1/a R d1/d11/a1 +2 files updated, 0 files merged, 2 files removed, 0 files unresolved # move every file under d1 starting with an 'a' to d2/d21 (regexp) copying d1/a to d2/d21/a copying d1/d11/a1 to d2/d21/a1 @@ -160,15 +176,19 @@ A d2/d21/a1 R d1/a R d1/d11/a1 +2 files updated, 0 files merged, 2 files removed, 0 files unresolved # attempt to overwrite an existing file d1/ca: not overwriting - file exists ? d1/ca +0 files updated, 0 files merged, 0 files removed, 0 files unresolved # forced overwrite of an existing file A d1/ca R d1/ba +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # replace a symlink with a file A d1/ca R d1/ba +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # do not copy more than one source file to the same destination file copying d1/d11/a1 to d3/d11/a1 d3/b: not overwriting - d2/b collides with d1/b @@ -181,6 +201,7 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # move a whole subtree with "hg rename ." copying a to ../d3/d1/a copying b to ../d3/d1/b @@ -198,6 +219,7 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # move a whole subtree with "hg rename --after ." copying a to ../d3/a copying b to ../d3/b @@ -215,6 +237,7 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # move the parent tree with "hg rename .." copying ../a to ../../d3/a copying ../b to ../../d3/b @@ -232,6 +255,7 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 4 files removed, 0 files unresolved # skip removed files copying d1/a to d3/a copying d1/ba to d3/ba @@ -246,14 +270,18 @@ R d1/b R d1/ba R d1/d11/a1 +4 files updated, 0 files merged, 3 files removed, 0 files unresolved # transitive rename A d1/bc R d1/b +1 files updated, 0 files merged, 1 files removed, 0 files unresolved # transitive rename --after A d1/bc R d1/b +1 files updated, 0 files merged, 1 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 # check illegal path components abort: path contains illegal component: .hg/foo @@ -261,12 +289,14 @@ abort: path contains illegal component: .hg/foo ! d1/d11/a1 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved abort: path contains illegal component: .hg/a1 abort: ../a1 not under root abort: path contains illegal component: .hg/a1 ! d1/d11/a1 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved abort: path contains illegal component: .hg/foo abort: ../../../foo not under root