upstream/mercurial-mirror Files · tests/test-sparse-clear.t

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Gregory Szorc - - Load All Authors

File last commit:

r33293:c9cbf4de default


                r38817:bb54db4a

@96 default

Download file

             test-sparse-clear.t
        
                    73 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-sparse-clear.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      test sparse

        $ hg init myrepo

        $ cd myrepo

        $ cat >> $HGRCPATH <<EOF

        > [extensions]

        > sparse=

        > purge=

        > strip=

        > rebase=

        > EOF

        $ echo a > index.html

        $ echo x > data.py

        $ echo z > readme.txt

        $ cat > base.sparse <<EOF

        > [include]

        > *.sparse

        > EOF

        $ hg ci -Aqm 'initial'

        $ cat > webpage.sparse <<EOF

        > %include base.sparse

        > [include]

        > *.html

        > EOF

        $ hg ci -Aqm 'initial'

      Clear rules when there are includes

        $ hg debugsparse --include *.py

        $ ls

        data.py

        $ hg debugsparse --clear-rules

        $ ls

        base.sparse

        data.py

        index.html

        readme.txt

        webpage.sparse

      Clear rules when there are excludes

        $ hg debugsparse --exclude *.sparse

        $ ls

        data.py

        index.html

        readme.txt

        $ hg debugsparse --clear-rules

        $ ls

        base.sparse

        data.py

        index.html

        readme.txt

        webpage.sparse

      Clearing rules should not alter profiles

        $ hg debugsparse --enable-profile webpage.sparse

        $ ls

        base.sparse

        index.html

        webpage.sparse

        $ hg debugsparse --include *.py

        $ ls

        base.sparse

        data.py

        index.html

        webpage.sparse

        $ hg debugsparse --clear-rules

        $ ls

        base.sparse

        index.html

        webpage.sparse

	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

				test sparse

				$ hg init myrepo
				$ cd myrepo
				$ cat >> $HGRCPATH <<EOF
				> [extensions]
				> sparse=
				> purge=
				> strip=
				> rebase=
				> EOF

				$ echo a > index.html
				$ echo x > data.py
				$ echo z > readme.txt
				$ cat > base.sparse <<EOF
				> [include]
				> *.sparse
				> EOF
				$ hg ci -Aqm 'initial'
				$ cat > webpage.sparse <<EOF
				> %include base.sparse
				> [include]
				> *.html
				> EOF
				$ hg ci -Aqm 'initial'

				Clear rules when there are includes

				$ hg debugsparse --include *.py
				$ ls
				data.py
				$ hg debugsparse --clear-rules
				$ ls
				base.sparse
				data.py
				index.html
				readme.txt
				webpage.sparse

				Clear rules when there are excludes

				$ hg debugsparse --exclude *.sparse
				$ ls
				data.py
				index.html
				readme.txt
				$ hg debugsparse --clear-rules
				$ ls
				base.sparse
				data.py
				index.html
				readme.txt
				webpage.sparse

				Clearing rules should not alter profiles

				$ hg debugsparse --enable-profile webpage.sparse
				$ ls
				base.sparse
				index.html
				webpage.sparse
				$ hg debugsparse --include *.py
				$ ls
				base.sparse
				data.py
				index.html
				webpage.sparse
				$ hg debugsparse --clear-rules
				$ ls
				base.sparse
				index.html
				webpage.sparse