Mercurial > hg > mercurial-source
changeset 12976:793563fd88c0
merge with stable
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 13 Nov 2010 15:12:09 +0100 |
parents | 278e3c9b939e (current diff) 75e4fade4ad9 (diff) |
children | a1a50567b5d2 |
files | hgext/eol.py |
diffstat | 2 files changed, 44 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/eol.py +++ b/hgext/eol.py @@ -179,6 +179,10 @@ self._decode['NATIVE'] = 'to-crlf' eol = config.config() + # Our files should not be touched. The pattern must be + # inserted first override a '** = native' pattern. + eol.set('patterns', '.hg*', 'BIN') + # We can then parse the user's patterns. eol.parse('.hgeol', data) if eol.get('repository', 'native') == 'CRLF':
new file mode 100644 --- /dev/null +++ b/tests/test-eol-tag.t @@ -0,0 +1,40 @@ +http://mercurial.selenic.com/bts/issue2493 + +Testing tagging with the EOL extension + + $ cat > $HGRCPATH <<EOF + > [diff] + > git = True + > + > [extensions] + > eol = + > + > [eol] + > native = CRLF + > EOF + +setup repository + + $ hg init repo + $ cd repo + $ cat > .hgeol <<EOF + > [patterns] + > ** = native + > EOF + $ printf "first\r\nsecond\r\nthird\r\n" > a.txt + $ hg commit --addremove -m 'checkin' + adding .hgeol + adding a.txt + +Tag: + + $ hg tag 1.0 + +Rewrite .hgtags file as it would look on a new checkout: + + $ hg update -q null + $ hg update -q + +Touch .hgtags file again: + + $ hg tag 2.0