Mercurial > hg > mercurial-source
view tests/test-eol-tag.t @ 16255:ca5cc2976574 stable
merge: handle linear update to symlink correctly (issue3316)
This fixes a regression introduced by fcf66193b186. If no file-level
merge is needed, we can update flags directly, otherwise we have a
conflict to resolve in filemerge.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 13 Mar 2012 16:28:08 -0500 |
parents | c1629963158a |
children | f2719b387380 |
line wrap: on
line source
http://mercurial.selenic.com/bts/issue2493 Testing tagging with the EOL extension $ cat >> $HGRCPATH <<EOF > [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