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

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r32255:7e35d31b

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 ..