Mercurial > hg
view tests/test-rename-after-merge.out @ 5567:56e9f7b2d8fa
rename: add test for moving untracked files in directories
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 01 Dec 2007 12:54:34 -0600 |
parents | c6682cdada2f |
children | 784eadabd985 |
line wrap: on
line source
% create source repository adding a % fork source repository 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b % update source repository % merge repositories pulling from ../t2 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) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % rename b as c A c R b % rename back c as b