Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-rename.out @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents 7e6138cb8d38
children
line wrap: on
line source

# rename 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
# 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
# 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
# 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
# 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
# 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
# rename directory d1 as d3
copying d1/a to d3/a
copying d1/b to d3/b
copying d1/ba to d3/ba
copying d1/d11/a1 to d3/d11/a1
removing d1/a
removing d1/b
removing d1/ba
removing d1/d11/a1
A d3/a
  d1/a
A d3/b
  d1/b
A d3/ba
  d1/ba
A d3/d11/a1
  d1/d11/a1
R d1/a
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
copying d1/ba to d3/ba
copying d1/d11/a1 to d3/d11/a1
removing d1/a
removing d1/b
removing d1/ba
removing d1/d11/a1
A d3/a
  d1/a
A d3/b
  d1/b
A d3/ba
  d1/ba
A d3/d11/a1
  d1/d11/a1
R d1/a
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
  d1/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
  d1/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
  d1/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
copying d1/ba to d3/d1/ba
copying d1/d11/a1 to d3/d1/d11/a1
copying d2/b to d3/d2/b
removing d1/a
removing d1/b
removing d1/ba
removing d1/d11/a1
removing d2/b
A d3/d1/a
  d1/a
A d3/d1/b
  d1/b
A d3/d1/ba
  d1/ba
A d3/d1/d11/a1
  d1/d11/a1
A d3/d2/b
  d2/b
R d1/a
R d1/b
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
copying d1/ba to d3/d1/ba
copying d1/d11/a1 to d3/d1/d11/a1
copying d2/b to d3/d2/b
removing d1/a
removing d1/b
removing d1/ba
removing d1/d11/a1
removing d2/b
A d3/d1/a
  d1/a
A d3/d1/b
  d1/b
A d3/d1/ba
  d1/ba
A d3/d1/d11/a1
  d1/d11/a1
A d3/d2/b
  d2/b
R d1/a
R d1/b
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
copying d1/d11/a1 to d2/d11/a1
removing d1/d11/a1
A d2/a
  d1/a
A d2/ba
  d1/ba
A d2/d11/a1
  d1/d11/a1
R d1/a
R d1/ba
R d1/d11/a1
1c1
< d1/b
---
> d2/b
3 files updated, 0 files merged, 3 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
# attempt to move potentially more than one file into a non-existent
# directory
abort: with multiple sources, destination must be an existing directory
# move every file under d1 to d2/d21 (glob)
copying d1/a to d2/d21/a
copying d1/b to d2/d21/b
copying d1/ba to d2/d21/ba
copying d1/d11/a1 to d2/d21/a1
removing d1/a
removing d1/b
removing d1/ba
removing d1/d11/a1
A d2/d21/a
  d1/a
A d2/d21/a1
  d1/d11/a1
A d2/d21/b
  d1/b
A d2/d21/ba
  d1/ba
R d1/a
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
removing d1/a
removing d1/d11/a1
A d2/d21/a
  d1/a
A d2/d21/a1
  d1/d11/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
removing d1/a
removing d1/d11/a1
A d2/d21/a
  d1/a
A d2/d21/a1
  d1/d11/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
  d1/ba
R d1/ba
1 files updated, 0 files merged, 1 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
# 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
removing d1/d11/a1
A d3/a
  d1/a
A d3/b
  d1/b
A d3/ba
  d1/ba
A d3/d11/a1
  d1/d11/a1
R d1/a
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
copying ba to ../d3/d1/ba
copying d11/a1 to ../d3/d1/d11/a1
removing a
removing b
removing ba
removing d11/a1
A d3/d1/a
  d1/a
A d3/d1/b
  d1/b
A d3/d1/ba
  d1/ba
A d3/d1/d11/a1
  d1/d11/a1
R d1/a
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
copying ba to ../d3/ba
copying d11/a1 to ../d3/d11/a1
removing a
removing b
removing ba
removing d11/a1
A d3/a
  d1/a
A d3/b
  d1/b
A d3/ba
  d1/ba
A d3/d11/a1
  d1/d11/a1
R d1/a
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
copying ../ba to ../../d3/ba
copying a1 to ../../d3/d11/a1
removing ../a
removing ../b
removing ../ba
removing a1
A d3/a
  d1/a
A d3/b
  d1/b
A d3/ba
  d1/ba
A d3/d11/a1
  d1/d11/a1
R d1/a
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
copying d1/d11/a1 to d3/d11/a1
removing d1/a
removing d1/ba
removing d1/d11/a1
A d3/a
  d1/a
A d3/ba
  d1/ba
A d3/d11/a1
  d1/d11/a1
R d1/a
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
  d1/b
R d1/b
1 files updated, 0 files merged, 1 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
# 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
abort: ../foo not under root
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