Mercurial > hg
view tests/test-convert-svn-startrev.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 | 90d8dfb481e7 |
| children |
line wrap: on
line source
% convert before branching point initializing destination A-r3-hg repository scanning source... sorting... converting... 3 removeb 2 changeaa 1 branch, changeaaa 0 addc,changeaaaa o 3 addc,changeaaaa files: a c | o 2 branch, changeaaa files: a | o 1 changeaa files: a | o 0 removeb files: a % convert before branching point initializing destination A-r4-hg repository scanning source... sorting... converting... 2 changeaa 1 branch, changeaaa 0 addc,changeaaaa o 2 addc,changeaaaa files: a c | o 1 branch, changeaaa files: a | o 0 changeaa files: a % convert at branching point initializing destination A-r5-hg repository scanning source... sorting... converting... 1 branch, changeaaa 0 addc,changeaaaa o 1 addc,changeaaaa files: a c | o 0 branch, changeaaa files: a % convert last revision only initializing destination A-r6-hg repository scanning source... sorting... converting... 0 addc,changeaaaa o 0 addc,changeaaaa files: a c