Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-convert-svn.out @ 5483:0c43f87baba3 default tip
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 | 91a522a69c13 |
| children |
line wrap: on
line source
% initial svn import Adding t/a Committed revision 1. % update svn repository A t2/a Checked out revision 1. A b Sending a Adding b Transmitting file data .. Committed revision 2. % convert to hg once assuming destination trunk-hg initializing destination trunk-hg repository scanning source... sorting... converting... 1 init 0 changea % update svn repository again Sending a Sending b Transmitting file data .. Committed revision 3. % test incremental conversion assuming destination trunk-hg destination trunk-hg is a Mercurial repository scanning source... sorting... converting... 0 changeb % test filemap initializing destination fmap repository scanning source... sorting... converting... 2 init 1 changea 0 changeb o 1 changeb files: b | o 0 changea files: b # now tests that it works with trunk/branches/tags layout % initial svn import Adding projA/trunk Adding projA/branches Adding projA/tags Committed revision 4. % update svn repository Checked out revision 4. A letter.txt Adding letter.txt Transmitting file data . Committed revision 5. Sending letter.txt Transmitting file data . Committed revision 6. Committed revision 7. Sending letter.txt Transmitting file data . Committed revision 8. % convert to hg once initializing destination A-hg repository scanning source... sorting... converting... 3 init projA 2 hello 1 world 0 nice day updating tags % update svn repository again A letter2.txt Sending letter.txt Adding letter2.txt Transmitting file data .. Committed revision 9. Committed revision 10. Sending letter2.txt Transmitting file data . Committed revision 11. % test incremental conversion destination A-hg is a Mercurial repository scanning source... sorting... converting... 1 second letter 0 work in progress updating tags o 7 update tags files: .hgtags | o 6 work in progress files: letter2.txt | o 5 second letter files: letter.txt letter2.txt | o 4 update tags files: .hgtags | o 3 nice day files: letter.txt | o 2 world files: letter.txt | o 1 hello files: letter.txt | o 0 init projA files: tip v0.2 v0.1