tests/test-rename-dir-merge2.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 11 Jul 2007 17:40:41 -0300
changeset 4859 41ad4105dde9
parent 4416 bb1800a7d7e1
permissions -rw-r--r--
Add symlink method to util.opener. Differences from os.symlink: - the symlink name is relative to the opener base directory - if a file with that name already exists, it's removed - if necessary, parent directories are created - if the system (OS or filesystem) doesn't support symlinks, a regular file is created. Its contents are the symlink target.

adding a/f
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
copying a/f to b/f
removing a/f
adding a/aa/g
pulling from ../r2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M b/f
A b/aa/g
  a/aa/g
R a/aa/g
R a/f