Mercurial > hg
view tests/test-convert-mtn-rename-directory.out @ 11346:e740f36cfb4b
tests: rename test-merge3 to test-add-remove.
It tests that 'hg commit' does not crash if the user removes a newly
added file, which has nothing to do with merging.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 14 Jun 2010 13:39:00 -0400 |
parents | 88a2687fbd38 |
children |
line wrap: on
line source
% tedious monotone keys configuration % create monotone repository mtn: adding dir1 to workspace manifest mtn: adding dir1/subdir1 to workspace manifest mtn: adding dir1/subdir1/file1 to workspace manifest mtn: beginning commit on branch 'com.selenic.test' mtn: committed revision 5ed13ff5582d8d1e319f079b694a37d2b45edfc8 % rename directory mtn: skipping dir1, already accounted for in workspace mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest mtn: beginning commit on branch 'com.selenic.test' mtn: committed revision 985204142a822b22ee86b509d61f3c5ab6857d2b % convert assuming destination repo.mtn-hg initializing destination repo.mtn-hg repository scanning source... sorting... converting... 1 initialize 0 rename 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % manifest dir1/subdir2/file1