upstream/mercurial-mirror Files · tests/test-eol-tag.t

update: teach hg to override untracked dir with a tracked file on update...

update: teach hg to override untracked dir with a tracked file on update This is a fix to an old problem when Mercurial got confused by an untracked folder with the same name as one of the files in a commit hg was trying to update to. It is pretty safe to remove this folder if it is empty. Backing up an empty folder seems to go against Mercurial's "don't track dirs" philosophy.

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r29480:1e4512ea

default

Download file

             test-eol-tag.t
        
                    39 lines
            
             | 574 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-eol-tag.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      https://bz.mercurial-scm.org/2493

      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

        $ cd ..

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				https://bz.mercurial-scm.org/2493

				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

				$ cd ..