Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-convert-svn.out @ 5390:36c46e20976a
merge: provide *_ISLINK environment vars to merge helper
Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Wed, 03 Oct 2007 23:09:36 +0200 |
| parents | d7d395fb7cd5 |
| children | 91a522a69c13 |
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