Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-addremove-similar.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 | 8d982aef0be1 |
children |
line wrap: on
line source
adding empty-file adding large-file adding another-file removing empty-file removing large-file recording removal of large-file as rename to another-file (99% similar) % comparing two empty files caused ZeroDivisionError in the past 2 files updated, 0 files merged, 1 files removed, 0 files unresolved adding another-empty-file removing empty-file adding large-file adding tiny-file adding small-file removing large-file removing tiny-file recording removal of tiny-file as rename to small-file (82% similar) % should all fail abort: similarity must be a number abort: similarity must be between 0 and 100 abort: similarity must be between 0 and 100